diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-23 01:39:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-23 01:39:50 -0700 |
| commit | d32643c0ff6d74b967b65e867f1f99dba840836e (patch) | |
| tree | 1c667614f8a1ec71fa79150d3cac03197fb4ae60 /diff-lib.c | |
| parent | Merge branch 'rr/forbid-bs-in-ref' (diff) | |
| parent | merge-recursive: never leave index unmerged while recursing (diff) | |
| download | git-d32643c0ff6d74b967b65e867f1f99dba840836e.tar.gz git-d32643c0ff6d74b967b65e867f1f99dba840836e.zip | |
Merge branch 'do/maint-merge-recursive-fix'
* do/maint-merge-recursive-fix:
merge-recursive: never leave index unmerged while recursing
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions