mercurial vimdiff

korg on 2013/09/04 06:26 of Violet Hippo

It seems that quitting mercurials attempt to do a diff3 merge in vimdiff tags your code as 'add your changes and undo the last external addition'. *sigh*

code repositories hate me.

(log in to comment)

Comments

jerith on 2013/09/04 06:44:

Mercurial's conflict-handling behaviour isn't the best. I end up having to figure out confused repo states at least two or three times every pyweek. Maybe one day we'll sort out the right bits on the server and switch to git...

stefanor on 2013/09/04 09:21:

Aha. I used to have

[merge-tools]
hg_merge_diff.priority = 100

But it seems, the traditional conflict marker option is now called "internal".

http://mercurial.selenic.com/wiki/MergeToolConfiguration#Internal_merge_with_conflict_markers

bobsmith on 2013/09/04 10:15:

Code repositories hate everyone equally :)

mauve on 2013/09/04 16:57:

Ah, thanks, I've been struggling with Mercurial popping up Meld with the panes in a stupid order.

Mercurial and I like each other apart from that.