mergetools / gvimdiff3on commit commit: do not lose SQUASH_MSG contents (b64c1e0)
   1. "$MERGE_TOOLS_DIR/vimdiff"