tests/test-issue612.out
author Patrick Mezard <pmezard@gmail.com>
Tue, 11 Sep 2007 23:04:42 +0200
changeset 5298 cba2a689117d
parent 4819 9797124581c9
child 5610 2493a478f395
permissions -rw-r--r--
parents: make it match the doc when called on a file parents used to return the parent revision of the last revision updating selected file, instead of the updating revision itself.

adding src/a.c
copying src/a.c to source/a.c
removing src/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