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
..
attributes/merge	Support -merge attribute in binary macro	2017-06-27 10:33:50 +02:00
diff	Allow setting FileMode to executable when applying patches in ApplyCommand	2016-05-17 00:08:01 -07:00
indexdiff	Fix symlink content comparison on MacOS in tree walk	2016-10-11 00:20:23 +02:00
nls	Fix TestTranslationBundle	2010-12-31 14:01:34 -08:00
patch	Initial JGit contribution to eclipse.org	2009-09-29 16:47:03 -07:00
test/resources	Fix ArrayIndexOutOfBoundsException in DirCacheIterator	2010-12-22 14:11:22 -08:00
util/sha1	SHA-1: collision detection support	2017-02-28 16:38:43 -08:00