tests/test-merge2.out
author Brendan Cully <brendan@kublai.com>
Mon, 14 Aug 2006 11:10:21 -0700
changeset 2888 ce967d96a1c1
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Properly shell-quote arguments in extdiff

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