tests/test-issue612.out
author Matt Mackall <mpm@selenic.com>
Thu, 27 Dec 2007 23:55:40 -0600
changeset 5738 2a54e2b177b6
parent 5610 2493a478f395
child 6336 4b0c9c674707
permissions -rw-r--r--
bisect: use proper locking when updating bisect.state

adding src/a.c
moving src/a.c to source/a.c
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
? src/a.o
merging src/a.c and source/a.c
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M source/a.c
R src/a.c
? source/a.o