Andrew's git / gitweb.git / diff
?
octopus: allow manual resolve on the last round.
authorJunio C Hamano <junkio@cox.net>
Sat, 14 Jan 2006 00:45:42 +0000 (16:45 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 15 Jan 2006 01:21:38 +0000 (17:21 -0800)
Signed-off-by: Junio C Hamano <junkio@cox.net>
No differences found