Skip to content

Commit ca0770e

Browse files
author
Harald Klimach
committed
Remove quotes from base local and other, as hg already quotes them.
1 parent 944186e commit ca0770e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff 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
107107
to your `.hgrc` file.
108108
Or, 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
112112
as the args setting to call `DiffConflictsWithHistory`.

doc/diffconflicts.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ For Mercurial use the following settings in your .hgrc:
1414

1515
[merge-tools]
1616
diffconflicts.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
1818
diffconflicts.premerge=keep
1919
diffconflicts.check=conflicts
2020

0 commit comments

Comments
 (0)