mergetools / gvimdiff3on commit Merge branch 'sg/lock-file-commit-error' into maint (abca668)
   1. "$MERGE_TOOLS_DIR/vimdiff"