Created
September 24, 2015 20:17
-
-
Save felipebizz/a7a54b4f6a3e091925f5 to your computer and use it in GitHub Desktop.
File for to use in Tutorial MELD
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
# | |
BASE=$1 | |
LOCAL=$2 | |
REMOTE=$3 | |
MERGED=$4 | |
# echo "Base (b), Local: (l), Remote: (r)" | |
# echo -n "which file to choose [b/l/r]: " | |
# read opt | |
# case $opt in | |
# b|B|base|Base|BASE) | |
# mv $BASE $MERGED | |
# ;; | |
# l|L|local|Local|LOCAL) | |
# mv $LOCAL $MERGED | |
# ;; | |
# r|R|remote|Remote|REMOTE) | |
# mv $REMOTE $MERGED | |
# ;; | |
# *) | |
# echo "incorrect option" | |
# esac | |
cp -frv $BASE $MERGED |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment