mergetools / gvimdiff2on commit Merge branch 'tz/git-svn-doc-markup-fix' (6e0bef3)
   1. "$MERGE_TOOLS_DIR/vimdiff"