Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge4.out @ 4363:c6413f8f2f8e
Use python instead of shell printf with \x for test-simplemerge-cmd
Needed e.g. to be compatible with Solaris.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 19 Apr 2007 12:47:55 +0200 |
parents | b2ae81a7df29 |
children |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)