]> source.dussan.org Git - jgit.git/commitdiff
Merge "Fixed Merge Algorithm regarding concurrent file creations"
authorChris Aniszczyk <caniszczyk@gmail.com>
Fri, 3 Dec 2010 01:19:04 +0000 (20:19 -0500)
committerCode Review <codereview-daemon@eclipse.org>
Fri, 3 Dec 2010 01:19:04 +0000 (20:19 -0500)

Trivial merge