view tests/test-merge5.out @ 5594:8623debad845

coverage: return to not assuming that python is in /usr/bin
author Bryan O'Sullivan <bos@serpentine.com>
date Sun, 02 Dec 2007 21:54:56 -0800
parents fffc8a733bf9
children 4b0c9c674707
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes