tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Tue, 10 Oct 2006 03:39:44 -0500
changeset 3316 39fd6e82ea38
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
merge: pull user messages out to hg.py - add _update for shadowing in clone - add _showstats helper - remove update parameter defaults - move stats message and merge help messages

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)