view tests/test-merge2.out @ 4816:c10d3bc05a8d

setup.py not executable: change instructions at beginning of file
author Christian Ebert <blacktrash@gmx.net>
date Thu, 28 Jun 2007 02:11:54 +0200
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b