Skip to content

Commit

Permalink
Update README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
gregsn committed Sep 24, 2020
1 parent 3b90263 commit 15e45dd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ For now, it is manual.
cmd = \"C:/Program Files/MergeVLDocs/MergeVLDocs.exe\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
path = C:/Program Files/MergeVLDocs/MergeVLDocs.exe
```
make sure the path above is correct and the executable is at the correect location.
make sure the path above is correct and the executable is at the correct location.
Note that the path is made of slashes, not back-slashes. (Sorry for the inconvenience)

This configures our merge tool to be called regardless of the file type. The idea here is that our tool should do its job for VL-files, but call the previously configured tool in all other cases.
Expand Down

0 comments on commit 15e45dd

Please sign in to comment.