mergetools / gvimdiff3on commit Merge branch 'ma/lockfile-cleanup' (2f76ebc)
   1. "$MERGE_TOOLS_DIR/vimdiff"