]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 83032e9) | patch
Fix Check for FF_ONLY merges again 88/9988/1
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Tue, 29 Jan 2013 07:05:00 +0000 (08:05 +0100)
committerRobin Rosenberg <robin.rosenberg@dewire.com>
Tue, 29 Jan 2013 07:05:00 +0000 (08:05 +0100)
commiteb6093293022e468c2aea93a11f63b366e0d3891
treeabc08cfd4528f7a2a770345e55e43706d42687d1tree | snapshot
parent83032e9f66552a43504456233ad9900bc2712077commit | diff
Fix Check for FF_ONLY merges again

Added more FF-mode tests

Change-Id: I33eed5737d9411cc1cf214da62ce719916a1b736
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit