From: Martin Renold <martinxyz@gmx.ch>
Date: Wed, 1 Jul 2009 20:18:04 +0000 (+0200)
Subject: Remove filename from conflict markers
X-Git-Tag: v1.6.4-rc0~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/606475f3178784e5a6b3a01dce1a54314345cf43?hp=606475f3178784e5a6b3a01dce1a54314345cf43

Remove filename from conflict markers

Put filenames into the conflict markers only when they are different.
Otherwise they are redundant information clutter.

Print the filename explicitely when warning about a binary conflict.

Signed-off-by: Martin Renold <martinxyz@gmx.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---