Mercurial > hg

view tests/test-merge5.out @ 6110:81e20e01d465

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
status: put added files that have disappeared in the deleted list This gives the user an indication that something went wrong with this file: $ hg add foo $ rm foo $ hg status foo ! foo Fixes issue212.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Thu, 14 Feb 2008 18:08:16 -0200
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