Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diffdir @ 1663:d529cdc0a3ee
return a non-zero exit code when a merge failed
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Mon, 30 Jan 2006 12:02:06 +1300 |
parents | 4f81068ed8cd |
children | fde8fb2cbede |
line wrap: on
line source
#!/bin/sh hg init touch a hg add a hg ci -m "a" -d "0 0" echo 123 > b hg add b hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" hg diff -r tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"