Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 463:ea93402b81b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added stdint.h include to fix build on Mac OS X Tiger [v10.4]
author kyle@zeus.moffetthome.net
date Fri, 24 Jun 2005 20:53:51 -0500
parents 5e9e8b8d2629
children 7e4843b7efd2
line wrap: on
line source

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