Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-586 @ 5417:b8872655f951
hgk: allow any extdiff command for visual diff
author | TK Soh <teekaysoh@yahoo.com> |
---|---|
date | Mon, 08 Oct 2007 11:18:34 +0800 |
parents | 720ae5085ee3 |
children |
line wrap: on
line source
#!/bin/sh # a test for issue586 hg init a cd a echo a > a hg ci -Ama hg init ../b cd ../b echo b > b hg ci -Amb hg pull -f ../a hg merge hg rm -f a hg ci -Amc hg st -A