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.vet...@intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahti...@linux.intel.com> Regards. Joonas _______________________________________________ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools