Skip to content

Commit

Permalink
fix paths for meld command line
Browse files Browse the repository at this point in the history
The paths are not relative to $PWD
  • Loading branch information
championswimmer committed Mar 10, 2017
1 parent 6fefbbe commit 06e9314
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ <h3>
prompt = false
[difftool "meld"]
trustExitCode = true
cmd = open -W -a Meld --args \"$LOCAL\" \"$PWD/$REMOTE\"
cmd = open -W -a Meld --args \"$LOCAL\" \"$REMOTE\"
[merge]
tool = meld
[mergetool]
prompt = false
[mergetool "meld"]
trustExitCode = true
cmd = open -W -a Meld --args --auto-merge \"$PWD/$LOCAL\" \"$PWD/$BASE\" \"$PWD/$REMOTE\" --output=\"$PWD/$MERGED\"
cmd = open -W -a Meld --args --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output=\"$MERGED\"
</code></pre>
</blockquote>

Expand Down

0 comments on commit 06e9314

Please sign in to comment.