Meld-merge

#!/bin/bash

if [[ $# != 4 ]]; then
  echo "Usage: $0 LOCAL BASE REMOTE OUTPUT";
  return 1;
fi

LOCAL=$1
BASE=$2
REMOTE=$3
OUTPUT=$4

BASENAME=$(basename $OUTPUT);

meld -n --label="$BASENAME" --label="Mine" "$BASE" "$LOCAL" &
sleep .1 # oh my goooooooooooooood
meld -n --label="$BASENAME" --label="Theirs" "$BASE" "$REMOTE" &
sleep .1 # yes I am dead serious right now
meld -n --label="Mine" --label="$BASENAME" --label="Theirs" --output "$OUTPUT" --auto-merge "$LOCAL" "$BASE" "$REMOTE" &
wait