Merge branch 'ah/misc-message-fixes'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"