facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

mergetools.hgrc: set vimdiff to check=changed

Browse Source 
The standard reaction in from of unexpected vimdiff is to ":quit". This will
make vimdiff return a 0 status even if no merge were done at all.

This change detect that nothing have been changed in vimdiff as a potential
unresolved conflict.
This commit is contained in:
Pierre-Yves David 2012-08-02 13:51:49 +02:00
parent 88105479b7
commit da8e5d78a1
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/mergetools.hgrc
View File

@ -16,6 +16,7 @@ gvimdiff.regname=path
gvimdiff.priority=-9
vimdiff.args=$local $other $base
vimdiff.check=changed
vimdiff.priority=-10
merge.checkconflicts=True