diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-21 11:34:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-21 11:34:24 -0700 |
| commit | 3a2dd481e51ed3ea01b84c7db4c661a0a3d5279c (patch) | |
| tree | 91ce5e5495f5d022bebd77ea41bd51970e8ec3db /diff.c | |
| parent | Merge branch 'zf/maint-gitweb-acname' into maint (diff) | |
| parent | merge-recursive: don't segfault while handling rename clashes (diff) | |
| download | git-3a2dd481e51ed3ea01b84c7db4c661a0a3d5279c.tar.gz git-3a2dd481e51ed3ea01b84c7db4c661a0a3d5279c.zip | |
Merge branch 'jc/maint-merge-recursive-fix' into maint
* jc/maint-merge-recursive-fix:
merge-recursive: don't segfault while handling rename clashes
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions