view tests/test-merge4.out @ 5395:e73a83af7926

hgk: add basic usage and configuration documentation
author Patrick Mezard <pmezard@gmail.com>
date Fri, 05 Oct 2007 23:40:33 +0200
parents b2ae81a7df29
children
line wrap: on
line source

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)