tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Sun, 26 Apr 2009 16:50:43 -0500
changeset 8181 03d93882fc93
parent 6336 4b0c9c674707
permissions -rw-r--r--
util: kill configparser wrapper

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)