diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-11 09:17:01 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-11 09:17:01 +0400 |
| commit | 14468ab45bae83ad300f17f41fe8fd555329ee5e (patch) | |
| tree | 0f6bcb7b16ac48757a3add8054f38ebe50819b0d /builtin-reset.c | |
| parent | 9c5164032f4c25090e6139a202825febb830feea (diff) | |
| parent | c94736a27f89bfc268aed0de7264deecdc136a58 (diff) | |
Merge branch 'jc/maint-merge-recursive-fix'
* jc/maint-merge-recursive-fix:
merge-recursive: don't segfault while handling rename clashes
Diffstat (limited to 'builtin-reset.c')
0 files changed, 0 insertions, 0 deletions