Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/git
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"