Mercurial > hg
view tests/test-simple-update @ 7665:950484f05f16
Update win32 merge tools configuration
Add WinMerge and Beyond Compare 3 to default merge tools configuration.
Fix TortoiseMerge configuration.
author | Pascal Quantin <pascal.quantin@gmail.com> |
---|---|
date | Sat, 17 Jan 2009 18:51:40 +0100 |
parents | ad3d5b4367cb |
children |
line wrap: on
line source
#!/bin/sh set -e mkdir test cd test echo foo>foo hg init hg addremove hg commit -m "1" hg verify hg clone . ../branch cd ../branch hg co echo bar>>foo hg commit -m "2" cd ../test hg pull ../branch hg verify hg co cat foo hg manifest --debug