| Junio C Hamano | fe6beab | 2008-12-04 17:08:48 -0800 | [diff] [blame] | 1 | From: A U Thor <au.thor@example.com> |
| 2 | Date: Thu Dec 4 16:00:00 2008 -0800 | ||||
| 3 | Subject: Three | ||||
| 4 | |||||
| 5 | Application of this should be rejected even with -C1 because the | ||||
| 6 | preimage line in the context does not match. | ||||
| 7 | |||||
| 8 | diff --git i/file-1 w/file-1 | ||||
| 9 | index 06e567b..10f8342 100644 | ||||
| 10 | --- i/file-1 | ||||
| 11 | +++ w/file-1 | ||||
| 12 | @@ -1,6 +1,6 @@ | ||||
| 13 | 1 | ||||
| 14 | 2 | ||||
| 15 | -Tres | ||||
| 16 | +Three | ||||
| 17 | 4 | ||||
| 18 | 5 | ||||
| 19 | 6 | ||||