Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-unrelated-pull @ 1581:db10b7114de0
abort when merging two heads and repository has local changes
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 14 Dec 2005 22:19:03 -0600 |
parents | 2073e5a71008 |
children | 7544700fd931 |
line wrap: on
line source
#!/bin/sh mkdir a cd a hg init echo 123 > a hg add a hg commit -m "a" -u a -d "0 0" cd .. mkdir b cd b hg init echo 321 > b hg add b hg commit -m "b" -u b -d "0 0" hg pull ../a hg heads