Merge branch 'jc/lock-report-on-error'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"