mergetools / vimdiff2on commit git-svn: workaround for a bug in svn serf backend (2394e94)
   1. "$MERGE_TOOLS_DIR/vimdiff"