mergetools / gvimdiff2on commit Merge branch 'ap/combine-diff-coalesce-lost' (a15696b)
   1. "$MERGE_TOOLS_DIR/vimdiff"