]> source.dussan.org Git - jgit.git/commitdiff
Merge "ResolveMerger: push result file creation into updateIndex()"
authorMatthias Sohn <matthias.sohn@sap.com>
Fri, 8 Aug 2014 22:34:47 +0000 (18:34 -0400)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Fri, 8 Aug 2014 22:34:47 +0000 (18:34 -0400)

Trivial merge