Merge branch 'tb/push-simple-uses-branch-merge-config'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"