diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-06 14:50:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-06 14:50:46 -0700 |
| commit | 3f3f8d9d09cdb6810e848d82583749e6080d2167 (patch) | |
| tree | 5f85fe29add68b68d375c0c74f0791f811f4692c /advice.c | |
| parent | f9bdf9b2102bd848c7a3eabff2ba5af63828de54 (diff) | |
| parent | a757c646ee78ae21c9e8ac66dcc52e361c15c7d2 (diff) | |
| download | git-3f3f8d9d09cdb6810e848d82583749e6080d2167.tar.gz | |
Merge branch 'jc/conflict-marker-size'
* jc/conflict-marker-size:
diff --check: honor conflict-marker-size attribute
Diffstat (limited to 'advice.c')
0 files changed, 0 insertions, 0 deletions