![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 17 Mar 2007 07:33:17 +0000 (00:33 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 17 Mar 2007 07:33:17 +0000 (00:33 -0700) | ||
| commit | 1589e0517fd22c198799504d6888d5a475024152 | |
| tree | 3686772961b548988c75edbd53de84a97efeb573 | tree | snapshot |
| parent | 4287307833a7c67b09973fc1023311e473f830b2 | commit | diff |
| parent | 2be08a84bae10a0c7ecf2ef921896ce838a6ed0b | commit | diff |
Merge branch 'maint'
* maint:
git-merge: finish when git-read-tree fails
* maint:
git-merge: finish when git-read-tree fails