JoshDreamland icon

Meld-merge

JoshDreamland | PRO | 06/02/15 06:14:09 PM UTC | 0 ⭐ | 462 👁️ | Never ⏰ | []
Bash |

500 B

|

None

|

0 👍

/

0 👎

Raw Download Clone Embed Print View 
#!/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

Comments

  • icon
    01/01/70 12:00:00 AM UTC
    Plain Text |

    0 B

    |

    👍

    /

    👎

    
    
    

    

            
    •