]> source.dussan.org Git - jgit.git/commitdiff
Merge "Make the resolve merger slightly more sub-classable."
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Mon, 5 May 2014 19:09:03 +0000 (15:09 -0400)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Mon, 5 May 2014 19:09:03 +0000 (15:09 -0400)

Trivial merge