2 Commits

Author	SHA1	Message	Date
Brodie Rao	4be7b3bfc3	merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' ... Without specifying the parent revision of the working copy, users will update to tip, which is most likely the other head they were trying to merge, not the revision they were at before the merge.	2010-09-12 18:05:53 -05:00
Nicolas Dumazet	8ff97c8aa5	tests: unify test-log	2010-08-15 23:34:46 +09:00