view tests/test-merge4.out @ 4450:8fa54b9c6c5a

accept -r REV in more places Commands affected: * update * merge * backout
author Daniel Holth <dholth@fastmail.fm>
date Thu, 17 May 2007 13:55:24 -0400
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)