]> source.dussan.org Git - jgit.git/commitdiff
projects / jgit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c36a892 298486a)
Merge "IndexDiff: conflicting files aren't properly shown"
authorChris Aniszczyk <caniszczyk@gmail.com>
Thu, 5 May 2011 19:34:49 +0000 (15:34 -0400)
committerCode Review <codereview-daemon@eclipse.org>
Thu, 5 May 2011 19:34:49 +0000 (15:34 -0400)

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