Show More
@@ -45,7 +45,7 b' type "$MELD" >/dev/null 2>&1 || MEL' | |||
|
45 | 45 | RAND="$RANDOM$RANDOM" |
|
46 | 46 | |
|
47 | 47 | # temporary directory for diff+patch merge |
|
48 |
HGTMP="${TMPDIR- |
|
|
48 | HGTMP="${TMPDIR-/tmp}/hgmerge.$RAND" | |
|
49 | 49 | |
|
50 | 50 | # backup file |
|
51 | 51 | BACKUP="$LOCAL.orig.$RAND" |
@@ -74,10 +74,11 b' failure() {' | |||
|
74 | 74 | |
|
75 | 75 | # Ask if the merge was successful |
|
76 | 76 | ask_if_merged() { |
|
77 |
while |
|
|
78 |
echo "$LOCAL seems unchanged. |
|
|
77 | while true; do | |
|
78 | echo "$LOCAL seems unchanged." | |
|
79 | echo "Was the merge successful? [y/n]" | |
|
79 | 80 | read answer |
|
80 | case answer in | |
|
81 | case "$answer" in | |
|
81 | 82 | y*|Y*) success;; |
|
82 | 83 | n*|N*) failure;; |
|
83 | 84 | esac |
General Comments 0
You need to be logged in to leave comments.
Login now