diff tests/test-merge-commit.out @ 5019:e6cc4d4f5a81

Ignore mergebackup files generated by mpatch
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 26 Jul 2007 13:38:20 -0700
parents e7282dede8cd
children 17ed9b9a0d03
line wrap: on
line diff