view tests/test-merge3.out @ 1449:30146be3437c

Add test-confused-revert, fix permissions on test-revert
author Matt Mackall <mpm@selenic.com>
date Tue, 25 Oct 2005 15:54:44 -0700
parents 5a034646e472
children 91c56c427171
line wrap: on
line source

removing b
b never committed!
nothing changed