Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge4 @ 1148:fad2d091c74f
Add test-grep.out file for now.
author | bos@serpentine.internal.keyresearch.com |
---|---|
date | Mon, 29 Aug 2005 11:28:48 -0700 |
parents | 0902ffece4b4 |
children | 7544700fd931 |
line wrap: on
line source
#!/bin/sh hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "0 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "0 0" hg update 0 echo This is file c1 > c hg add c hg commit -m "commit #2" -d "0 0" hg update -m 1 rm b echo This is file c22 > c hg commit -m "commit #3" -d "0 0"