?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 9e9b267) | patch
octopus: allow manual resolve on the last round.
commit98efc8f3d890a0c671b7e2000e43b2e0a96b9a73
authorJunio C Hamano <junkio@cox.net>
Sat, 14 Jan 2006 00:45:42 +0000 (13 16:45 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 15 Jan 2006 01:21:38 +0000 (14 17:21 -0800)
treeac506f25b4eebedb2731b0bc470a87e94d9dde51tree | snapshot (tar.gz zip)
parent9e9b26751a5ca7a257b3e1cfb319fe3e4efc663ccommit | diff
octopus: allow manual resolve on the last round.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-octopus.sh diff | blob | blame | history
Dscho's miscellaneous git branches