Heya, On Sat, Jun 5, 2010 at 20:07, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> That patch (d1b1a919) breaks merge-one-file when run outside the test >> suite as far as I can tell. > > Thanks for catching. I wonder if something like this would be better in > that it wouldn't break people who do not use custom "DIFF" while it would > help people who do at the same time... > > Makefile | 2 ++ > git-merge-one-file.sh | 2 +- No addition to the test suite to catch this in the future? -- Cheers, Sverre Rabbelier -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html