Mathieu Cartaud f7e233e450 Support -merge attribute in binary macro ... 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>		2017-06-27 10:33:50 +02:00
..
META-INF/services	Ignore trailing comments in transport SPI parsing	2012-03-21 14:07:55 -07:00
org/eclipse/jgit	Support -merge attribute in binary macro	2017-06-27 10:33:50 +02:00
jgit-s3-config.disabled.properties	Adding AES Walk Encryption support in http://www.jets3t.org/ mode	2015-10-18 19:14:31 +00:00
jgit-s3-config.policy.bucket.json	Adding AES Walk Encryption support in http://www.jets3t.org/ mode	2015-10-18 19:14:31 +00:00
jgit-s3-config.policy.user.json	Adding AES Walk Encryption support in http://www.jets3t.org/ mode	2015-10-18 19:14:31 +00:00
jgit-s3-connection-v-0.properties	Adding JGitV1 and JGitV2 Walk Encryption	2015-10-18 23:22:56 +02:00
jgit-s3-connection-v-1.properties	Adding JGitV1 and JGitV2 Walk Encryption	2015-10-18 23:22:56 +02:00
jgit-s3-connection-v-2.properties	Adding JGitV1 and JGitV2 Walk Encryption	2015-10-18 23:22:56 +02:00
log4j.properties	Adding AES Walk Encryption support in http://www.jets3t.org/ mode	2015-10-18 19:14:31 +00:00