diff tests/test-merge-prompt.out @ 6874:8dc21876261e

commit: simplify file copy logic
author Matt Mackall <mpm@selenic.com>
date Sun, 10 Aug 2008 18:01:03 -0500
parents 4b0c9c674707
children 01ada7b1861d
line wrap: on
line diff