From: Chris Aniszczyk Date: Wed, 31 Oct 2012 00:00:14 +0000 (-0400) Subject: Merge "Refactor ResolveMergerTest to allow testing multiple strategies" X-Git-Tag: v2.2.0.201212191850-r~54 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cda5e861b98adc7078c9d3a38900dce9540e2127;p=jgit.git Merge "Refactor ResolveMergerTest to allow testing multiple strategies" --- cda5e861b98adc7078c9d3a38900dce9540e2127