mergetools / gvimdiff3on commit t6044: add more testcases with staged changes before a merge is invoked (7f5271f)
   1. "$MERGE_TOOLS_DIR/vimdiff"