repo.or.cz
/
git
/
kirr.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
Merge branch 'cb/maint-orphan-merge-noclobber'
[git/kirr.git]
/
t
/
t4252
/
am-test-1-1
blob
b0c09dc96583758a84839cab3696aadc253272dd
1
From: A U Thor <au.thor@example.com>
2
Date: Thu Dec 4 16:00:00 2008 -0800
3
Subject: Three
4
5
Application of this should be rejected because the first line in the
6
context does not match.
7
8
diff --git i/file-1 w/file-1
9
index 06e567b..10f8342 100644
10
--- i/file-1
11
+++ w/file-1
12
@@ -1,6 +1,6 @@
13
One
14
2
15
-3
16
+Three
17
4
18
5
19
6