"Alexander Gladysh" <agladysh@xxxxxxxxx> writes: > On Tue, May 20, 2008 at 1:02 PM, Jeff King <peff@xxxxxxxx> wrote: >> >> So there is perhaps something specific about your setup or your conflict >> that is causing mergetool not to work as expected. > > Most likely so. > >> Can you give us a test case that fails? > > No, unfortunately I can not. I was unable to produce a minimal test > case, and I can not share the whole repo. Can you use contents-scrambling tool by Jeff King from Message-ID: <20080510055332.GB11556@xxxxxxxxxxxxxxxxxxxxx> http://permalink.gmane.org/gmane.comp.version-control.git/81652 I hope it would be aded at least to contrib when it is tested more... -- Jakub Narebski Poland ShadeHawk on #git -- 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
