view tests/test-merge5.out @ 6103:e668fd796b8b

Propagating changes back to working dirs when changing files in external
author Fabio Zadrozny <fabiofz at gmail dot com>
date Sun, 26 Aug 2007 21:31:18 -0300
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