tests/test-merge4.out
author Doug Philips <dgou@mac.com>
Thu, 07 Aug 2008 09:31:42 +0200
changeset 6865 d923a051f84c
parent 6336 4b0c9c674707
permissions -rw-r--r--
Let the notify extension use [diff] options too.

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)