aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeMessageFormatterTest.java
Commit message (Expand)AuthorAgeFilesLines
* Organize importsDavid Pursehouse2016-11-141-1/+1
* Repository: Introduce exactRef and findRef, deprecate getRefJonathan Nieder2015-11-251-24/+24
* Move SampleDataRepositoryTestCase to org.eclipse.jgit.testShawn Pearce2013-11-241-1/+1
* Move base test classes to the junit bundle for reuse for Java 7 testsRobin Rosenberg2013-02-041-1/+1
* Add conflicts message before footerStefan Lay2013-01-191-0/+42
* Adapt merge message to C Git for remote-tracking branchRobin Stocker2011-11-231-2/+2
* Fix "into" part of merge message for HEADRobin Stocker2011-05-051-0/+9
* Don't print "into HEAD" when merging refs/heads/masterRobin Stocker2011-02-011-0/+10
* Convert all JGit unit tests to JUnit 4Robin Rosenberg2010-12-311-2/+16
* Format merge commit messages like C GitRobin Stocker2010-11-061-0/+155