Mercurial > hg
diff tests/test-up-local-change @ 1797:42f75cd04bf4
Fix hgmerge: mkdir "'/tmp'/hgmerge..." and ask_if_merged() didn't work.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 23 Feb 2006 14:42:47 +0100 |
parents | dee55c4a4963 |
children | 7544700fd931 |