tests/test-merge4.out
author Mads Kiilerich <mads@kiilerich.com>
Wed, 30 Jun 2010 17:20:42 +0200
changeset 11494 2347513f562a
parent 6336 4b0c9c674707
permissions -rw-r--r--
debugger: show traceback before entering pdb post-mortem

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)