7ef0d62730
Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'
20 lines
308 B
Text
20 lines
308 B
Text
From: A U Thor <au.thor@example.com>
|
|
Date: Thu Dec 4 16:00:00 2008 -0800
|
|
Subject: Six
|
|
|
|
Applying this patch with --directory='frotz nitfol' should fail
|
|
|
|
diff --git i/junk/file-2 w/junk/file-2
|
|
index 06e567b..b6f3a16 100644
|
|
--- i/junk/file-2
|
|
+++ w/junk/file-2
|
|
@@ -1,7 +1,7 @@
|
|
One
|
|
2
|
|
-3
|
|
+Three
|
|
4
|
|
5
|
|
-6
|
|
+Six
|
|
7
|