Merge branch 'jx/proc-receive-hook'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"