mergetools / gvimdiff2on commit rerere: convert to use parse_pathspec (01a10b0)
   1. "$MERGE_TOOLS_DIR/vimdiff"