view tests/test-merge3.out @ 1349:c6295d2a361e

More info on file merge for update --debug
author Matt Mackall <mpm@selenic.com>
date Mon, 26 Sep 2005 14:01:05 -0700
parents 5a034646e472
children 91c56c427171
line wrap: on
line source

removing b
b never committed!
nothing changed