Merge branch 'pb/commit-editmsg-path'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"