Merge branch 'master' into next

[git] / t / t4252 / am-test-5-2

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