Mercurial > hg
view tests/test-conflict.out @ 1285:1546c2aa6b30
Make 'hg import' platform independent.
- moved popen("patch ...") from commands.py to util.py
- files may not be single quoted in popen under windows: fixed
- patch returns the files quoted under windows. quotes need to
be stripped off: fixed
| author | Volker Kleinfeld <Volker.Kleinfeld@gmx.de> |
|---|---|
| date | Tue, 20 Sep 2005 21:35:51 -0700 |
| parents | 5a034646e472 |
| children | 7544700fd931 |
line wrap: on
line source
merge: warning: conflicts during merge merging a merging a failed! 32e80765d7fe+75234512624c+ tip something else ======= something M a