view tests/test-cat.out @ 11452:eac141407b85 stable

merge: document how to 'undo' a merge
author Matt Mackall <mpm@selenic.com>
date Sun, 27 Jun 2010 17:41:43 -0500
parents f5b00b6e426a
children a4fbbe0fbc38
line wrap: on
line source

adding a
adding b
0
0
0
0
a: No such file in rev 03f6b0774996
1