Re: Visualizing merge conflicts after the fact (using kdiff3)

2015-06-16 Thread Eric Raible
On 6/16/2015 2:43 AM, Johannes Schindelin wrote: > Hi Eric, > > On 2015-06-16 03:17, Eric Raible wrote: >> I'm running 1.9.5.msysgit.1, but this is a general git question... >> >> Upon returning from a vacation, I was looking at what people had been >> up

Visualizing merge conflicts after the fact (using kdiff3)

2015-06-15 Thread Eric Raible
er people have wanted to review how conflicts were resolved w/out looking at the noise of unconflicted changes, right? Thanks - Eric (raible at gmail ) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html