Skip to content
Snippets Groups Projects
Commit f53d97d6 authored by Sascha Wilde's avatar Sascha Wilde
Browse files

Use smerge minor mode in emacs to resolve conflicts.

The condition-case is used to suppress errors with emacs versions before 21.
parent de7c7727
No related branches found
No related tags found
No related merge requests found
......@@ -169,7 +169,14 @@
if [ -n "$MERGE" -o -n "$DIFF3" ]; then
echo "conflicts detected in $LOCAL"
cp "$BACKUP" "$CHGTEST"
$EDITOR "$LOCAL" || failure
case "$EDITOR" in
"emacs")
$EDITOR "$LOCAL" --eval '(condition-case nil (smerge-mode 1) (error nil))' || failure
;;
*)
$EDITOR "$LOCAL" || failure
;;
esac
# Some editors do not return meaningful error codes
# Do not take any chances
$TEST "$LOCAL" -nt "$CHGTEST" && conflicts_or_success || ask_if_merged
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment