comparison tests/test-rename-merge1.out @ 4118:bb70d5fa02ae

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 27 Feb 2007 16:47:16 -0600
parents 0fb66912040a
children 723e0ddb6ada
comparison
equal deleted inserted replaced
4114:d5011e347476 4118:bb70d5fa02ae