Mercurial > hg
view tests/test-mq-safety.out @ 7385:8119c1a607c4
mergetools: add pointer to the usual filemerge path
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sun, 16 Nov 2008 20:56:55 -0800 |
parents | dcda0c90125c |
children | 6d891df43a5f |
line wrap: on
line source
% try to commit on top of a patch abort: cannot commit over an applied mq patch % qpop/qrefresh on the wrong revision abort: working directory revision is not qtip using patch queue: abort: popping would remove a revision not managed by this patch queue abort: working directory revision is not qtip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % qpop abort: popping would remove a revision not managed by this patch queue % qrefresh abort: cannot refresh a revision with children % tip: 3 append quux