Skip to content

Instantly share code, notes, and snippets.

@jlatt

jlatt/git-ediff

Created March 21, 2012 21:57
Download ZIP

Revisions

  1. jlatt created this gist Mar 21, 2012.
    5 changes: 5 additions & 0 deletions gistfile1.txt
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,5 @@
    # ~/.gitconfig
    [difftool "ediff"]
    cmd = git-ediff "$LOCAL" "$REMOTE"
    [diff]
    tool = ediff
    2 changes: 2 additions & 0 deletions git-ediff
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,2 @@
    #!/bin/bash
    emacsclient -e "(ediff \"$1\" \"$2\")"