]> source.dussan.org Git - jgit.git/commitdiff
projects / jgit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3699ea6 a50ed56)
Merge "status: Print conflict description for unmerged paths"
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Thu, 25 Apr 2013 21:45:35 +0000 (17:45 -0400)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Thu, 25 Apr 2013 21:45:35 +0000 (17:45 -0400)

Trivial merge
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit