File tree Expand file tree Collapse file tree 1 file changed +0
-4
lines changed
Expand file tree Collapse file tree 1 file changed +0
-4
lines changed Original file line number Diff line number Diff line change @@ -97,20 +97,16 @@ splitting them apart.
9797
9898Configure Mercurial to use diffconflicts as a mergetool by adding:
9999
100- ```
101100 [merge-tools]
102101 diffconflicts.executable=vim
103102 diffconflicts.args=-c 'let g:diffconflicts_vcs="hg"' -c DiffConflicts "$output" "$base" "$local" "$other"
104103 diffconflicts.premerge=keep
105104 diffconflicts.check=conflicts
106105 diffconflicts.priority=99
107- ```
108106
109107to your `.hgrc` file.
110108Or, if you prefer to always open both the diff view and the history view use
111109
112- ```
113110 diffconflicts.args=-c 'let g:diffconflicts_vcs="hg"' -c DiffConflictsWithHistory "$output" "$base" "$local" "$other"
114- ```
115111
116112as the args setting to call `DiffConflictsWithHistory`.
You can’t perform that action at this time.
0 commit comments