diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-09 22:38:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-09 22:38:34 -0700 |
| commit | daaf2e8892cf3b652454c48ffd332e3c5b446b92 (patch) | |
| tree | cdf705c81efd7e7916bd2bc361274ed26543fa5f /builtin/commit-tree.c | |
| parent | 326bea47cb7315a7ee8e428dbf6b1052ffb01b00 (diff) | |
| parent | a757c646ee78ae21c9e8ac66dcc52e361c15c7d2 (diff) | |
| download | git-daaf2e8892cf3b652454c48ffd332e3c5b446b92.tar.gz | |
Merge branch 'jc/conflict-marker-size' into maint
* jc/conflict-marker-size:
diff --check: honor conflict-marker-size attribute
Diffstat (limited to 'builtin/commit-tree.c')
0 files changed, 0 insertions, 0 deletions