Mercurial > hg > pyhgsh

view tests/test-merge4.out @ 774:6592c4f5cd4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change sed patterns in tests to strip dates after spaces or tabs
author mpm@selenic.com
date Tue, 26 Jul 2005 19:03:45 -0800
parents 7e4843b7efd2
children 1f9ec150a476 8f5637f0a0c0 0902ffece4b4
line wrap: on
line source

+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ hg update 0
+ echo This is file c1
+ hg add c
+ hg commit -m 'commit #2' -d '0 0'
+ hg update -m 1
+ rm b
+ echo This is file c22
+ hg commit -m 'commit #3' -d '0 0'