mergetools / gvimdiff2on commit Merge branch 'jc/combine-diff-many-parents' (4dd7c77)
   1. "$MERGE_TOOLS_DIR/vimdiff"