From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 10 Apr 2010 05:38:34 +0000 (-0700)
Subject: Merge branch 'jc/conflict-marker-size' into maint
X-Git-Tag: v1.7.1-rc1~3^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=daaf2e8892cf3b652454c48ffd332e3c5b446b92;p=git.git

Merge branch 'jc/conflict-marker-size' into maint

* jc/conflict-marker-size:
  diff --check: honor conflict-marker-size attribute
---

daaf2e8892cf3b652454c48ffd332e3c5b446b92