mergetools / gvimdiff2on commit Merge branch 'ap/diff-ignore-blank-lines' (08585fd)
   1. "$MERGE_TOOLS_DIR/vimdiff"