diff tests/test-excessive-merge @ 2732:42a02b5773d4

import: allow application/x-patch for funny patch from christian ebert
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 30 Jul 2006 21:24:06 -0700
parents e506c14382fd
children ad3d5b4367cb
line wrap: on
line diff