mergetools / gvimdiffon commit Merge branch 'bc/commit-invalid-utf8' (c8abf65)
   1. "$MERGE_TOOLS_DIR/vimdiff"