![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 14 Jan 2006 00:45:42 +0000 (16:45 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 15 Jan 2006 01:21:38 +0000 (17:21 -0800) | ||
| commit | 98efc8f3d890a0c671b7e2000e43b2e0a96b9a73 | |
| tree | ac506f25b4eebedb2731b0bc470a87e94d9dde51 | tree | snapshot |
| parent | 9e9b26751a5ca7a257b3e1cfb319fe3e4efc663c | commit | diff |
octopus: allow manual resolve on the last round.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge-octopus.sh | diff | blob | history |