equal
deleted
inserted
replaced
490 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
490 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
491 (branch merge, don't forget to commit) |
491 (branch merge, don't forget to commit) |
492 |
492 |
493 $ hg tag t1 |
493 $ hg tag t1 |
494 abort: uncommitted merge |
494 abort: uncommitted merge |
495 [255] |
495 [20] |
496 $ hg status |
496 $ hg status |
497 $ hg tag --rev 1 t2 |
497 $ hg tag --rev 1 t2 |
498 abort: uncommitted merge |
498 abort: uncommitted merge |
499 [255] |
499 [20] |
500 $ hg tag --rev 1 --local t3 |
500 $ hg tag --rev 1 --local t3 |
501 $ hg tags -v |
501 $ hg tags -v |
502 tip 2:2a156e8887cc |
502 tip 2:2a156e8887cc |
503 t3 1:c3adabd1a5f4 local |
503 t3 1:c3adabd1a5f4 local |
504 |
504 |