From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Apr 2010 21:50:46 +0000 (-0700)
Subject: Merge branch 'jc/conflict-marker-size'
X-Git-Tag: v1.7.1-rc0~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f3f8d9d09cdb6810e848d82583749e6080d2167;p=thirdparty%2Fgit.git

Merge branch 'jc/conflict-marker-size'

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

3f3f8d9d09cdb6810e848d82583749e6080d2167