mirrors/jgit - jgit - source @ dussan.org

Geschiedenis

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>		7 jaren geleden
..
attributes/merge	Support -merge attribute in binary macro	7 jaren geleden
diff	Allow setting FileMode to executable when applying patches in ApplyCommand	8 jaren geleden
indexdiff	Fix symlink content comparison on MacOS in tree walk	7 jaren geleden
nls	Fix TestTranslationBundle	13 jaren geleden
patch	Initial JGit contribution to eclipse.org	14 jaren geleden
test/resources	Fix ArrayIndexOutOfBoundsException in DirCacheIterator	13 jaren geleden
util/sha1	SHA-1: collision detection support	7 jaren geleden