equal
deleted
inserted
replaced
167 |
167 |
168 # Attempt to do a merge with $EDITOR |
168 # Attempt to do a merge with $EDITOR |
169 if [ -n "$MERGE" -o -n "$DIFF3" ]; then |
169 if [ -n "$MERGE" -o -n "$DIFF3" ]; then |
170 echo "conflicts detected in $LOCAL" |
170 echo "conflicts detected in $LOCAL" |
171 cp "$BACKUP" "$CHGTEST" |
171 cp "$BACKUP" "$CHGTEST" |
172 $EDITOR "$LOCAL" || failure |
172 case "$EDITOR" in |
|
173 "emacs") |
|
174 $EDITOR "$LOCAL" --eval '(condition-case nil (smerge-mode 1) (error nil))' || failure |
|
175 ;; |
|
176 *) |
|
177 $EDITOR "$LOCAL" || failure |
|
178 ;; |
|
179 esac |
173 # Some editors do not return meaningful error codes |
180 # Some editors do not return meaningful error codes |
174 # Do not take any chances |
181 # Do not take any chances |
175 $TEST "$LOCAL" -nt "$CHGTEST" && conflicts_or_success || ask_if_merged |
182 $TEST "$LOCAL" -nt "$CHGTEST" && conflicts_or_success || ask_if_merged |
176 fi |
183 fi |
177 |
184 |