Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 840:141744605b51
hg status: added options to select files by status.
Added options -m, -a, -r and u to select files corresponding
to status M, A, R and ? respectively. If none of these
options are specified, files of all status will be shown.
| author | tksoh@users.sourceforge.net |
|---|---|
| date | Sat, 06 Aug 2005 07:09:10 +0100 |
| parents | 9c918287d10b |
| children | 5a034646e472 |
line wrap: on
line source
+ hg init + hg add a b + hg commit -m commit #0 -d 0 0 + hg commit -mcomment #1 -d 0 0 + hg update 0 + hg commit -A -mcomment #2 -d 0 0 removing b + hg update 1 this update spans a branch affecting the following files: b aborting update spanning branches! (use update -m to merge across branches or -C to lose changes)