| commit | 5c44cc9ea29b74ed10f5f239791b2c2f9586f197 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 May 2009 02:03:43 +0000 (25 19:03 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 May 2009 02:03:43 +0000 (25 19:03 -0700) | ||
| tree | 229ac0b470b16816573dbee84e71e2d02fd9798c | treesnapshot (tar.gz zip) |
| parent | 417653777a1d073f53b2053cf0b0838a35cfc7d5 | commitdiff |
| parent | bf74106a5b4577fd695d15a28ad51537ae7470d8 | commitdiff |
Merge branch 'do/maint-merge-recursive-fix' into maint
* 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 | blobhistory |