Mercurial > hg
comparison tests/test-import.out @ 10524:3212afb33116 stable
patch: fix patching with fuzz and eol normalization
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 22 Feb 2010 22:55:58 +0100 |
parents | a27af7229850 |
children | 7a5931c5f2dc |
comparison
equal
deleted
inserted
replaced
10523:4bab7c3db4e1 | 10524:3212afb33116 |
---|---|
203 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 203 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
204 created new head | 204 created new head |
205 applying tip.patch | 205 applying tip.patch |
206 patching file a | 206 patching file a |
207 Hunk #1 succeeded at 1 with fuzz 2 (offset -2 lines). | 207 Hunk #1 succeeded at 1 with fuzz 2 (offset -2 lines). |
208 a | 208 reverting a |
209 % test fuzziness with eol=auto | |
210 applying tip.patch | |
211 patching file a | |
212 Hunk #1 succeeded at 1 with fuzz 2 (offset -2 lines). | |
209 adding a | 213 adding a |
210 adding b1 | 214 adding b1 |
211 adding c1 | 215 adding c1 |
212 adding d | 216 adding d |
213 diff --git a/a b/a | 217 diff --git a/a b/a |