view tests/test-merge2.out @ 5444:a0952e4e52eb

mpatch: allow buffer objects for input
author Matt Mackall <mpm@selenic.com>
date Thu, 11 Oct 2007 00:46:45 -0500
parents b2ae81a7df29
children
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