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

[Maxime Ripard]

On Wed, Oct 11, 2017 at 08:54:00AM +0000, Daniel Vetter wrote:
> 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.
> 
> Cc: Maxime Ripard <maxime.ripard at free-electrons.com>
> Cc: Noralf Trønnes <noralf at tronnes.org>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>

Tested-by: Maxime Ripard <maxime.ripard at free-electrons.com>

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/dim-tools/attachments/20171011/dbe0793b/attachment.sig>