mergetools / gvimdiff2on commit Merge branch 'bc/rev-parse-parseopt-fix' (b2a2c4d)
   1. "$MERGE_TOOLS_DIR/vimdiff"