]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e4672d1) | patch
ResolveMergerTest: Add tests for content merges 16/94416/1
authorDave Borowitz <dborowitz@google.com>
Tue, 4 Apr 2017 21:23:14 +0000 (17:23 -0400)
committerDave Borowitz <dborowitz@google.com>
Tue, 4 Apr 2017 21:27:15 +0000 (17:27 -0400)
commitedb6593ef00ae6e16f6cbbf7250bbfbf19d2a346
tree571b8f0a38c0b2e7ccb76158560ada02e6ded700tree | snapshot
parente4672d1c16c2dae3c8315c5b87abfd5aa49f3800commit | diff
ResolveMergerTest: Add tests for content merges

Change-Id: I2b85cc239e9b3090426c956cbf9af3deb4106a41
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit