7ef0d62730
Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'
15 lines
287 B
Text
15 lines
287 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 succeed
|
|
|
|
diff --git i/file-5 w/file-5
|
|
new file mode 100644
|
|
index 000000..1d6ed9f
|
|
--- /dev/null
|
|
+++ w/file-5
|
|
@@ -0,0 +1,3 @@
|
|
+One
|
|
+two
|
|
+three
|