Mercurial > hg-stable
view tests/test-merge4 @ 10729:7a5931c5f2dc stable
patch: enhance diff detection regexp, allow '--- ' in patch message
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Thu, 18 Mar 2010 18:22:34 +0100 |
parents | e506c14382fd |
children |
line wrap: on
line source
#!/bin/sh hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "1000000 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "1000000 0" hg update 0 echo This is file c1 > c hg add c hg commit -m "commit #2" -d "1000000 0" hg merge 1 rm b echo This is file c22 > c hg commit -m "commit #3" -d "1000000 0"