view tests/test-merge2.out @ 8648:ca443bac7ed4

fixed 0xc0150004 error building Mercurial under Python 2.6 for Windows
author Garth Roxburgh-Kidd <garth@deadlybloodyserious.com>
date Thu, 28 May 2009 17:03:35 +0200
parents 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head