Mercurial > hg

view tests/test-merge5.out @ 7397:4c92d8971809

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More verbose logging when filemerge searches for merge-tool Previously it was very hard to find out what was going on when the expected merge tool wasn't used. This patch tries to improve that. hg merge -v now shows which tools were searched for but not found.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 07 Nov 2008 02:47:12 +0100
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')