diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-15 12:39:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-15 12:39:12 -0700 |
| commit | 9f0ccb5b0ac067b3408d3776bb06f85acd4a1e7e (patch) | |
| tree | 6e3056f75553bb79e27b0364f83aca2e906d672c /test-obj-pool.c | |
| parent | 12644fa99fd16c33379c885670be0963cec07fc1 (diff) | |
| parent | d5af51053cd060d7a4893f030626b04351554d1b (diff) | |
| download | git-9f0ccb5b0ac067b3408d3776bb06f85acd4a1e7e.tar.gz git-9f0ccb5b0ac067b3408d3776bb06f85acd4a1e7e.tar.xz | |
Merge branch 'ks/recursive-rename-add-identical'
* ks/recursive-rename-add-identical:
RE: [PATCH] Avoid rename/add conflict when contents are identical
Diffstat (limited to 'test-obj-pool.c')
0 files changed, 0 insertions, 0 deletions