Merge branch 'jc/mention-tracking-for-pull-default'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"