Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 6c7f58d6f691c1091b90b0891e94c91e20fd6054 authored by Junio C Hamano on 04 June 2009, 05:42:15 UTC
GIT 1.6.3.2
Tip revision: 6c7f58d
am-test-4-1
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
back to top