Merge branch 'ss/describe-dirty-in-the-right-directory'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"