dotfiles / emacs_merge

#!/bin/sh

set -e # bail out quickly on failure
   
LOCAL="$1"
BASE="$2"
OTHER="$3"

BACKUP="$LOCAL.orig"
   
Restore ()
{
    cp "$BACKUP" "$LOCAL" 
}

ExitOK ()
{
    rm "$LOCAL.other"
    exit $?
}

echo "$LOCAL $BASE OTHER"

# Back up our file & other file
cp "$LOCAL" "$BACKUP"
cp "$OTHER" "$LOCAL.other"

# Attempt to do a non-interactive merge
if which merge > /dev/null 2>&1 ; then
    if merge "$LOCAL" "$BASE" "$OTHER" 2> /dev/null; then
           # success!
        ExitOK 
    fi
    Restore
elif which diff3 > /dev/null 2>&1 ; then
    if diff3 -m "$BACKUP" "$BASE" "$OTHER" > "$LOCAL" ; then
           # success
        ExitOK
    fi
    Restore
fi

if emacsclient --eval "(ediff-merge-with-ancestor \"$BACKUP\" \"$OTHER\" \"$BASE\" nil \"$LOCAL\")" 
      then       
       ExitOK
   fi

echo "emacs_merge: failed to merge files"
exit 1
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.