Skip to content

Instantly share code, notes, and snippets.

@vitorhsb

vitorhsb/diffmerge-macos-result.txt

Last active January 11, 2018 00:07
Show Gist options
  • Save vitorhsb/357b7ba83db8302244f97e5c3f4feef4 to your computer and use it in GitHub Desktop.
Save vitorhsb/357b7ba83db8302244f97e5c3f4feef4 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. vitorhsb revised this gist Jan 11, 2018. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion diffmerge-macos-result.txt
    View file
    Original file line number Diff line number Diff line change
    @@ -12,4 +12,4 @@
    [mergetool]
    keepBackup = false
    [difftool "diffmerge"]
    cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge --nosplash \"$LOCAL\" \"$REMOTE\"
    cmd = /usr/local/bin/diffmerge --nosplash \"$LOCAL\" \"$REMOTE\"
  2. vitorhsb revised this gist Jan 11, 2018. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion diffmerge-macos-result.txt
    View file
    Original file line number Diff line number Diff line change
    @@ -2,7 +2,7 @@
    tool = diffmerge

    [merge]
    tool = diffmerge
    tool = diffmerge

    ...

  3. vitorhsb created this gist Jan 11, 2018.
    15 changes: 15 additions & 0 deletions diffmerge-macos-result.txt
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,15 @@
    [diff]
    tool = diffmerge

    [merge]
    tool = diffmerge

    ...

    [mergetool "diffmerge"]
    cmd = /usr/local/bin/diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
    trustExitCode = true
    [mergetool]
    keepBackup = false
    [difftool "diffmerge"]
    cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge --nosplash \"$LOCAL\" \"$REMOTE\"