diff hgmerge @ 5479:f7c99e89178f

patchbomb: no traceback if (diffstat) confirmation is refused
author Christian Ebert <blacktrash@gmx.net>
date Sun, 28 Oct 2007 09:25:35 +0100
parents f53d97d651f4
children 3c80ecdc1bcd
line wrap: on
line diff