@matheusbsbs / matheus-bagliano / commits / daaf2e8892
Fork 0

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

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

Junio C Hamano committed Apr 9, 2010 at 22:38 UTC daaf2e8892cf3b652454c48ffd332e3c5b446b92

No changes.