![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 23 May 2009 08:39:50 +0000 (01:39 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 23 May 2009 08:39:50 +0000 (01:39 -0700) | ||
| commit | d32643c0ff6d74b967b65e867f1f99dba840836e | |
| tree | 1c667614f8a1ec71fa79150d3cac03197fb4ae60 | tree | snapshot |
| parent | e05aae684d453695bc5bd1e66aa96bc7d42e186a | commit | diff |
| parent | bf74106a5b4577fd695d15a28ad51537ae7470d8 | commit | diff |
Merge branch 'do/maint-merge-recursive-fix'
* do/maint-merge-recursive-fix:
merge-recursive: never leave index unmerged while recursing
* do/maint-merge-recursive-fix:
merge-recursive: never leave index unmerged while recursing
| merge-recursive.c | diff1 | | diff2 | | blob | history |