File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed
Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -99,14 +99,14 @@ Configure Mercurial to use diffconflicts as a mergetool by adding:
9999
100100 [merge-tools]
101101 diffconflicts.executable=vim
102- diffconflicts.args=-c 'let g:diffconflicts_vcs="hg"' -c DiffConflicts "$output" " $base" " $local" " $other"
102+ diffconflicts.args=-c 'let g:diffconflicts_vcs="hg"' -c DiffConflicts "$output" $base $local $other
103103 diffconflicts.premerge=keep
104104 diffconflicts.check=conflicts
105105 diffconflicts.priority=99
106106
107107to your `.hgrc` file.
108108Or, if you prefer to always open both the diff view and the history view use
109109
110- diffconflicts.args=-c 'let g:diffconflicts_vcs="hg"' -c DiffConflictsWithHistory "$output" " $base" " $local" " $other"
110+ diffconflicts.args=-c 'let g:diffconflicts_vcs="hg"' -c DiffConflictsWithHistory "$output" $base $local $other
111111
112112as the args setting to call `DiffConflictsWithHistory`.
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ For Mercurial use the following settings in your .hgrc:
1414
1515[merge-tools]
1616diffconflicts.executable=vim
17- diffconflicts.args=-c 'let g:diffconflicts_vcs="hg"' -c DiffConflicts "$output" " $base" " $local" " $other"
17+ diffconflicts.args=-c 'let g:diffconflicts_vcs="hg"' -c DiffConflicts "$output" $base $local $other
1818diffconflicts.premerge=keep
1919diffconflicts.check=conflicts
2020
You can’t perform that action at this time.
0 commit comments