merge conflict using meld: configure

Uwe Brauer oub at mat.ucm.es
Wed Sep 26 10:57:04 UTC 2018



Hi

When I run a conflicting merge, meld pops up and show at the left corner

Local-- test.org-- other

This always confuses me and I have to think which is which, couldn't just
the rev numbers be displayed.

Like 
1  0 2

Or with named branches

Default 0 new

Can this be configured?

Thanks

Uwe Brauer 



More information about the Mercurial mailing list