f7e233e450
The merger is now able to react to the use of the merge attribute. The value unset and the custom value 'binary' are handled (-merge and merge=binary) Since the specification of the merge attribute states that when the attribute is unset, ours version must be kept in case of a conflict, we don't overwrite the file but keep the local version. Bug: 517128 Change-Id: Ib5fbf17bdaf727bc5d0e106ce88f2620d9f87a6f Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr> |
||
---|---|---|
.. | ||
META-INF/services | ||
org/eclipse/jgit | ||
jgit-s3-config.disabled.properties | ||
jgit-s3-config.policy.bucket.json | ||
jgit-s3-config.policy.user.json | ||
jgit-s3-connection-v-0.properties | ||
jgit-s3-connection-v-1.properties | ||
jgit-s3-connection-v-2.properties | ||
log4j.properties |