tests/test-merge4.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 27 Aug 2007 01:44:35 -0300
changeset 5238 20817af258d8
parent 2175 b2ae81a7df29
permissions -rw-r--r--
pull -u: if "url#rev" was given, update to rev

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)