mergetools / gvimdiffon commit Merge branch 'jc/diff-ws-error-highlight' (abecdde)
   1. "$MERGE_TOOLS_DIR/vimdiff"