Merge branch 'ak/show-branch-usage-string'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"