view tests/test-merge5.out @ 1639:dbfc04a55607

_hg_status improvements in bash_completion: - Use "hg status -n" option instead of cut command. - Sort status flags accoring to "hg status --help" - Show deleted files instead of "hg remove"d for "hg remove"
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 26 Jan 2006 15:07:46 +0100
parents 5a034646e472
children ced2d3620f95
line wrap: on
line source

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)