Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge4 @ 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 | 0902ffece4b4 |
children | 7544700fd931 |
comparison
equal
deleted
inserted
replaced
1796:a373881fdf2a | 1797:42f75cd04bf4 |
---|