tests/test-merge5.out
author mpm@selenic.com
Tue, 23 Aug 2005 12:46:43 -0700
changeset 994 88c15682d9b0
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Fix callers to file.revision to use file.read This was causing unchanged files to show up as modified.

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)