diff tests/test-conflict @ 4039:55578a8d7e84

mq: allow push if -r is given explicitly
author Brendan Cully <brendan@kublai.com>
date Mon, 22 Jan 2007 20:22:25 -0800
parents e506c14382fd
children 46280c004f22
line wrap: on
line diff