Junio C Hamano wrote: > Felipe Contreras <felipe.contreras@xxxxxxxxx> writes: > > > The implementation details of the proposed patch are not relevant at > > this point; it was just to show an example of what Seth's diffconflicts > > vim plugin does. > > Sorry for commenting on the "irrelevant" part; as the patch was > marked with RFC label, I bothered to read it and tried to give > comments, but it wasn't clear which part was welcoming comments > and which parts were off limits ;-) All parts welcomed comments. I'm just saying the idea is what's important in my opinion. -- Felipe Contreras