Mercurial > hg > gitweb
view tests/test-merge5.out @ 831:232d0616a80a
Cleaned up trap handling:
- Use numbers instead of signal names
- No need to explicitly call "cleanup_exit RC" to exit with return code RC.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Thu, 04 Aug 2005 17:43:05 +0100 |
| parents | 0902ffece4b4 |
| children | 77e121a0d870 0932bc2fb2be 1fe3b14c7044 |
line wrap: on
line source
+ hg init + hg add a b + hg commit -m commit #0 -d 0 0 + hg commit -mcomment #1 -d 0 0 + hg update 0 + hg commit -A -mcomment #2 -d 0 0 removing b + hg update 1 this update spans a branch affecting the following files: b aborting update spanning branches! (use update -m to perform a branch merge)