[PATCH] dim: enforce consistent conflictstyle in drm-tip

[Chris Wilson]

Quoting Daniel Vetter (2017-10-11 09:54:00)
> Otherwise the tree rebuilding fails. This might be the reason why some
> git versions create different conflicts, since checking
> git-sources/rerere.c didn't provide any hint at all about what has
> changed.

For us simpletons, can you show us the difference in output so we don't
get confused?