aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeTest.java
Commit message (Expand)AuthorAgeFilesLines
* Added CLIText.fatalError(String) API for testsAndrey Loskutov2016-01-061-2/+4
* Make sure tests don't blindly continue if a command is "silently" failedAndrey Loskutov2015-12-311-2/+2
* Handle -m option for Merge commandAxel Richard2014-08-301-1/+24
* Make recursive merge strategy the default merge strategyMatthias Sohn2013-04-151-1/+1
* Add the no-commit option to MergeCommandTomasz Zarna2013-04-041-0/+34
* Add support for --no-ff while mergingTomasz Zarna2012-11-161-2/+57
* Add --squash option to org.eclipse.jgit.pgm.MergeTomasz Zarna2012-10-071-13/+43
* Add tests for output result of merging -- org.eclipse.jgit.pgm.MergeTomasz Zarna2012-09-171-0/+93