mergetools / gvimdiff2on commit t5505: fix "set-head --auto with ambiguous HEAD" test (a4dfee0)
   1. "$MERGE_TOOLS_DIR/vimdiff"