]> source.dussan.org Git - jgit.git/commitdiff
Merge "Add a test for merging deleted files"
authorShawn Pearce <spearce@spearce.org>
Fri, 5 Nov 2010 22:03:19 +0000 (18:03 -0400)
committerCode Review <codereview-daemon@eclipse.org>
Fri, 5 Nov 2010 22:03:19 +0000 (18:03 -0400)

Trivial merge