@matheusbsbs / matheus-bagliano / commits / 3f3f8d9d09
Fork 0

Merge branch 'jc/conflict-marker-size'

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

Junio C Hamano committed Apr 6, 2010 at 14:50 UTC 3f3f8d9d09cdb6810e848d82583749e6080d2167

No changes.