Mercurial > hg
view tests/test-merge5.out @ 7113:f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
'hg qrefresh --short file.txt' now adds changes made to file.txt to current
patch.
This builds on a patch for implementing --amend by Kirill Smelkov as discussed
in issue933.
FIXME: Why do mq refresh have two matchers if we only need one?
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Fri, 17 Oct 2008 21:26:39 +0200 |
parents | 0b89315d5de2 |
children | 68a1b9d0663e |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b created new head % should abort abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes) % should succeed abort: crosses branches (use 'hg merge' or 'hg update -C')