mergetools / vimdiff3on commit t6031: generalize for recursive and resolve strategies (f78d1fe)
   1. "$MERGE_TOOLS_DIR/vimdiff"