diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:23 -0700 |
| commit | 82c531b3b6d24040443ba739e150bc06ecc762ea (patch) | |
| tree | de6a17434e48ee7866941e2e5491d9cf4d9b96e1 /merge-recursive.c | |
| parent | 82e7ee7351d6e328294016d3b99825d8001abd24 (diff) | |
| parent | 9feeaa2bf39aed4a0148296f504f88b09b8901d4 (diff) | |
| download | git-82c531b3b6d24040443ba739e150bc06ecc762ea.tar.gz git-82c531b3b6d24040443ba739e150bc06ecc762ea.tar.xz | |
Merge branch 'by/log-follow'
* by/log-follow:
tests: rename duplicate t4205
Make git log --follow find copies among unmodified files.
Make diffcore_std only can run once before a diff_flush
Add a macro DIFF_QUEUE_CLEAR.
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions