Mercurial > hg

view tests/test-merge5.out @ 3985:4874ca8a53c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Send encoding information in rss header
author Edouard Gomez <ed.gomez@free.fr>
date Thu, 21 Dec 2006 20:41:56 +0100
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