[PATCH] dim: detect git 2.7 when conflicts fail

[Joonas Lahtinen]

Quoting Daniel Vetter (2018-03-28 15:17:18)
> Ubuntu 16.04 LTS has this version of git, and it's known to handle
> (some, but not all) stored conflict resolutions differently than newer
> versions of git.
> 
> Since it's a common snag detect it and suggest to upgrade.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>

Reviewed-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>

Regards. Joonas