]> source.dussan.org Git - jgit.git/commitdiff
Merge "Fix bug regarding handling of non-versioned files during merge"
authorMatthias Sohn <matthias.sohn@sap.com>
Mon, 22 Nov 2010 21:43:43 +0000 (16:43 -0500)
committerCode Review <codereview-daemon@eclipse.org>
Mon, 22 Nov 2010 21:43:43 +0000 (16:43 -0500)

Trivial merge