tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Thu, 11 Feb 2010 17:13:22 -0600
changeset 10419 992dc3d39357
parent 6336 4b0c9c674707
permissions -rw-r--r--
hgrc: update docs for the server section

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