tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Sun, 20 Aug 2006 23:52:52 -0500
changeset 2974 eef469259745
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
tag: shorten hash in default commit message Move default message to commands.py Pass node in binary for consistency Remove default arguments Fix up tests

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes