mergetools / gvimdiffon commit Merge branch 'cb/parse-magnitude' (e12b51e)
   1. "$MERGE_TOOLS_DIR/vimdiff"