Mercurial > hg
view tests/test-merge-remove.out @ 6673:16d2d093d1dd
update: improved help text
Using the term "the repository's working directory" instead of just "working
directory" to make it nearly impossible to confuse it with $PWD.
Also, this new wording better conveys the fact that update applies
to the working dir as a whole (no matter what the $PWD currently is).
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Wed, 11 Jun 2008 13:51:57 +0200 |
parents | 9eb274d773d9 |
children | 369ddc9c0339 |
line wrap: on
line source
created new head merging foo1 and foo to foo1 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) n 0 -2 bar m 644 14 foo1 copy: foo -> foo1 M bar M foo1 % removing foo1 and bar r 0 -2 bar r 0 -1 foo1 copy: foo -> foo1 R bar R foo1 % readding foo1 and bar adding bar adding foo1 n 0 -2 bar m 644 14 foo1 copy: foo -> foo1 M bar M foo1 foo % reverting foo1 and bar warning: working directory has two parents, tag '.' uses the first saving current version of bar as bar.orig reverting bar saving current version of foo1 as foo1.orig reverting foo1 n 0 -2 bar m 644 14 foo1 copy: foo -> foo1 M bar M foo1 foo