Mercurial > hg
view tests/test-merge4.out @ 3378:1106e00e6847
Add popen2 demandload to patch.py, required by diffstat
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 12 Oct 2006 16:34:32 -0700 |
parents | b2ae81a7df29 |
children | 4b0c9c674707 |
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)