]> source.dussan.org Git - jgit.git/commit
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)
commitb8fdda11cc4a786c24ba309ec755321dba6d9955
tree3fb9c8ef0d4bb4fa8b41df334d96da470920cf1e
parentc36a892e7f2e01fc39047068ac01537fc952db8e
parent298486a7c320629de12f9506e0133686a7382b01
Merge "IndexDiff: conflicting files aren't properly shown"