Mercurial > hg

view tests/test-merge5.out @ 5593:6ae8ed59c7b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix breaking test from 05451f6b5f07
author Bryan O'Sullivan <bos@serpentine.com>
date Sun, 02 Dec 2007 21:52:40 -0800
parents fffc8a733bf9
children 4b0c9c674707
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes