Mercurial > hg > pyhgsh
diff tests/README @ 2283:e506c14382fd
deprecate 'update -m'. use 'merge' instead.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sun, 14 May 2006 21:07:34 -0700 |
parents | 8a2a7f7d9df6 |
children |
line wrap: on
line diff
--- a/tests/README Sun May 14 17:37:34 2006 -0700 +++ b/tests/README Sun May 14 21:07:34 2006 -0700 @@ -16,10 +16,10 @@ There are some tricky points here that you should be aware of when writing tests: -- hg commit and hg up -m want user interaction +- hg commit and hg merge want user interaction for commit use -m "text" - for hg up -m, set HGMERGE to something noninteractive (like true or merge) + for hg merge, set HGMERGE to something noninteractive (like true or merge) - changeset hashes will change based on user and date which make things like hg history output change