Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge4 @ 5465:9873cbb134b2
mercurial.el, mq.el: remove runtime dependencies on CL package
* (require 'cl) at compile-time
* don't use map()
author | NIIMI Satoshi <sa2c@sa2c.net> |
---|---|
date | Thu, 11 Oct 2007 05:58:54 +0900 |
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"