]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2ae84c3) | patch
ResolveMerger: do not content-merge gitlinks on del/mod conflicts 91/164491/13
authorDemetr Starshov <dstarshov@google.com>
Wed, 12 Aug 2020 22:01:10 +0000 (15:01 -0700)
committerDemetr Starshov <dstarshov@google.com>
Thu, 27 Aug 2020 01:40:28 +0000 (18:40 -0700)
commit214c4afc2c9a7306ac989df218b7cab30ee5e026
treef4930d7a66be1908ce64f166963a774e67cb270etree | snapshot
parent2ae84c320a34ce3e29eaae72292ff7f1b5d723bacommit | diff
ResolveMerger: do not content-merge gitlinks on del/mod conflicts

Previously ResolveMerger tried to make a fulltext merge entry in case
one of sides got deleted regardless of file mode. This is not
applicable for GITLINK type of entry. After this change it is
rendering appropriate merge result.

Signed-off-by: Demetr Starshov <dstarshov@google.com>
Change-Id: Ibdb4557bf8781bdb48bcee6529e37dc80582ed7e
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit