mergetools / gvimdiff3on commit Merge branch 'sb/diff-emit-line-ws-markup-cleanup' (d1f96fd)
   1. "$MERGE_TOOLS_DIR/vimdiff"