Mercurial > hg
view tests/test-merge5.out @ 2580:a20a1bb0c396
diff: add -b/-B options
author | Haakon Riiser <haakon.riiser@fys.uio.no> |
---|---|
date | Thu, 29 Jun 2006 15:16:25 +0200 |
parents | b2ae81a7df29 |
children | 49988d9f0758 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b this update spans a branch affecting the following files: b aborting update spanning branches! (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)