-# Interactive three-way merge tool. It is executed by the 'resolved
-# --interactive' command
-#imerger = xxdiff --title1 current --title2 ancestor --title3 patched \
-# --show-merged-pane -m -E -O -X -M "%(output)s" \
-# "%(branch1)s" "%(ancestor)s" "%(branch2)s"
-#imerger = emacs --eval '(ediff-merge-files-with-ancestor \
-# "%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")'
+ # Interactive three-way merge tool. It is executed by the 'resolved
+ # --interactive' command
+ #imerger = xxdiff --title1 current --title2 ancestor --title3 patched \
+ # --show-merged-pane -m -E -O -X -M "%(output)s" \
+ # "%(branch1)s" "%(ancestor)s" "%(branch2)s"
+ #imerger = emacs --eval '(ediff-merge-files-with-ancestor \
+ # "%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")'