tests/test-merge2.out
author Christian Ebert <blacktrash@gmx.net>
Sat, 17 Feb 2007 09:54:44 +0100
changeset 4106 f5f171785e29
parent 2175 b2ae81a7df29
permissions -rw-r--r--
test-notify: adapt to sed shipped with MacOS MacOS X' sed does not have the \? repetition operator.

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