mergetools / gvimdiff2on commit t5520: test for failure if index has unresolved entries (05438af)
   1. "$MERGE_TOOLS_DIR/vimdiff"