mergetools / gvimdiff3on commit t7405: verify 'merge --abort' works after submodule/path conflicts (587421e)
   1. "$MERGE_TOOLS_DIR/vimdiff"