diff tests/test-conflict.t @ 14349:776ae95b8835

patch: merge makerejlines() into write_rej()
author Patrick Mezard <pmezard@gmail.com>
date Tue, 17 May 2011 23:46:37 +0200
parents 4134686b83e1
children 2371f4aea665
line wrap: on
line diff