view tests/test-merge4.out @ 5393:c2ad1890fc53

hgk: add debug-config command to pass configuration options
author Patrick Mezard <pmezard@gmail.com>
date Fri, 05 Oct 2007 22:39:36 +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)