mergetools / gvimdiff3on commit rebase: implement --merge via the interactive machinery (68aa495)
   1. "$MERGE_TOOLS_DIR/vimdiff"