mergetools / gvimdiff3on commit Merge branch 'ew/complete-svn-authorship-options' (f7490fd)
   1. "$MERGE_TOOLS_DIR/vimdiff"