fe6beab7e8
These tests make sure that "git am" does not lose command line options specified when it was started, after it is interrupted by a patch that does not apply earlier in the series. Signed-off-by: Junio C Hamano <gitster@pobox.com>
20 lines
354 B
Plaintext
20 lines
354 B
Plaintext
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 -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
|