mergetools / gvimdiff3on commit Merge branch 'jk/prune-mtime' (7cf6232)
   1. "$MERGE_TOOLS_DIR/vimdiff"