Merge branch 'ah/unpack-trees-advice-messages'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"