Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1.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 | 0902ffece4b4 |
children | 5a034646e472 |
line wrap: on
line source
+ hg init + hg add a + hg commit -m commit #0 -d 0 0 + hg add b + hg commit -m commit #1 -d 0 0 + hg update 0 + hg add c + hg commit -m commit #2 -d 0 0 + hg update -m 1 + hg init + hg add a + hg commit -m commit #0 -d 0 0 + hg add b + hg commit -m commit #1 -d 0 0 + hg update 0 + hg add c + hg commit -m commit #2 -d 0 0 + hg update -m 1 merging for b merging b + hg init + hg add a + hg commit -m commit #0 -d 0 0 + hg add b + hg commit -m commit #1 -d 0 0 + hg commit -m commit #2 -d 0 0 + hg update 1 + hg add c + hg commit -m commit #3 -d 0 0 This is file b1 + hg update -m 2 merging for b merging b + hg init + hg add a + hg commit -m commit #0 -d 0 0 + hg add b + hg commit -m commit #1 -d 0 0 + hg commit -m commit #2 -d 0 0 + hg update 1 + hg add c + hg commit -m commit #3 -d 0 0 + hg update -m 2 merging for b merging b