]> source.dussan.org Git - jgit.git/commitdiff
Merge "Fix MergeCommandTest to pass if File.executable is not supported" into stable-1.2
authorMatthias Sohn <matthias.sohn@sap.com>
Thu, 15 Dec 2011 23:58:48 +0000 (18:58 -0500)
committerCode Review <codereview-daemon@eclipse.org>
Thu, 15 Dec 2011 23:58:48 +0000 (18:58 -0500)

Trivial merge