comparison tests/test-log.t @ 15623:fc8c7a5ccc4a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 08 Dec 2011 16:01:44 -0600
parents 2371f4aea665 41885892796e
children 988409e44a76
comparison
equal deleted inserted replaced
15622:86fc364ca5f8 15623:fc8c7a5ccc4a
627 $ echo a > a 627 $ echo a > a
628 $ hg ci -A -m "commit on default" 628 $ hg ci -A -m "commit on default"
629 adding a 629 adding a
630 $ hg branch test 630 $ hg branch test
631 marked working directory as branch test 631 marked working directory as branch test
632 (branches are permanent and global, did you want a bookmark?)
632 $ echo b > b 633 $ echo b > b
633 $ hg ci -A -m "commit on test" 634 $ hg ci -A -m "commit on test"
634 adding b 635 adding b
635 636
636 $ hg up default 637 $ hg up default