Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-parse-date.out @ 2974:eef469259745

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Matt Mackall <mpm@selenic.com>
date Sun, 20 Aug 2006 23:52:52 -0500
parents c1974f65d781
children e96d2956eb4a
line wrap: on
line diff
--- a/tests/test-parse-date.out
+++ b/tests/test-parse-date.out
@@ -1,6 +1,6 @@
 reverting a
 changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8
-merging with changeset 2:99a1acecff55
+merging with changeset 2:e6c3abc120e7
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 abort: invalid date: 'should fail'