mirror of
https://github.com/git/git.git
synced 2024-10-31 06:17:56 +01:00
20 lines
350 B
Text
20 lines
350 B
Text
|
From: A U Thor <au.thor@example.com>
|
||
|
|
Date: Thu Dec 4 16:00:00 2008 -0800
|
||
|
|
Subject: Three
|
||
|
|
|
||
|
|
Application of this should be rejected even with -p2 because the
|
||
|
|
preimage line in the context does not match.
|
||
|
|
|
||
|
|
diff --git i/junk/file-1 w/junk/file-1
|
||
|
|
index 06e567b..10f8342 100644
|
||
|
|
--- i/junk/file-1
|
||
|
|
+++ w/junk/file-1
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
1
|
||
|
|
2
|
||
|
|
-Tres
|
||
|
|
+Three
|
||
|
|
4
|
||
|
|
5
|
||
|
|
6
|