diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-03 22:23:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 22:23:13 -0700 |
| commit | f92d62ec4ead67109418483b65aaf158b7462121 (patch) | |
| tree | 41c8b17b55ec094911c29c78a1067ba6e629daf7 /merge-recursive.h | |
| parent | cd1547d2049f32a5c13ba1828fcd1a553b844e97 (diff) | |
| parent | 2e3400c0521e4997601916790b8b2a9ff588c6f3 (diff) | |
| download | git-f92d62ec4ead67109418483b65aaf158b7462121.tar.gz | |
Merge branch 'nd/maint-fix-replace'
* nd/maint-fix-replace:
parse_object: pass on the original sha1, not the replaced one
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions