diff tests/test-merge-commit.out @ 5574:d4ec6d61b3ee

imported patch rev-help
author Matt Mackall <mpm@selenic.com>
date Sun, 02 Dec 2007 15:25:37 -0600
parents 17ed9b9a0d03
children 5af5f0f9d724
line wrap: on
line diff