view tests/test-merge3.out @ 2743:a31f0f2997e9

import: switch from application/x-patch to text/x-diff christian ebert says his mailer was broken.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 31 Jul 2006 12:02:13 -0700
parents 91c56c427171
children
line wrap: on
line source

removing b
nothing changed