Skip to content

Commit 7a44b37

Browse files
author
Harald Klimach
committed
Remove superfluous ticks in README.
1 parent a87c40e commit 7a44b37

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,20 +97,16 @@ splitting them apart.
9797
9898
Configure 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
109107
to your `.hgrc` file.
110108
Or, 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
116112
as the args setting to call `DiffConflictsWithHistory`.

0 commit comments

Comments
 (0)