![[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) |
* do/maint-merge-recursive-fix:
merge-recursive: never leave index unmerged while recursing
merge-recursive: never leave index unmerged while recursing
| 1 | 2 | |||
|---|---|---|---|---|
| merge-recursive.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc merge-recursive.c
Simple merge