diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-18 00:27:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-18 00:28:16 -0800 |
| commit | 03f94ae9f909952ed5a78917ab319a312889354b (patch) | |
| tree | 0fd041e8b390bd0d2a960ae629d8e965d363de92 /t/t4252/am-test-2-1 | |
| parent | 2c47789d817aaf745a5ce5d5f79619c634cc8566 (diff) | |
| parent | 81b50f3ce40bfdd66e5d967bf82be001039a9a98 (diff) | |
| download | git-03f94ae9f909952ed5a78917ab319a312889354b.tar.gz | |
Update jk/maint-strbuf-missing-init to builtin/ renamejk/maint-strbuf-missing-init
Diffstat (limited to 't/t4252/am-test-2-1')
| -rw-r--r-- | t/t4252/am-test-2-1 | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/t/t4252/am-test-2-1 b/t/t4252/am-test-2-1 new file mode 100644 index 0000000000..feda94a0cc --- /dev/null +++ b/t/t4252/am-test-2-1 @@ -0,0 +1,19 @@ +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 -C1 because the +preimage line in the context does not match. + +diff --git i/file-1 w/file-1 +index 06e567b..10f8342 100644 +--- i/file-1 ++++ w/file-1 +@@ -1,6 +1,6 @@ + 1 + 2 +-Tres ++Three + 4 + 5 + 6 |