Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- @@ -116,8 +116,8 @@
- context
- context
- - remove 1
- - remove 2
- - remove 3
- + add 1
- + add 2
- + add 3
- context
- context
- context
- @@ -116,4 +116,4 @@
- context
- context
- - remove 1
- - remove 2
- + add 1
- + add 2
- the
- quick
- brown
- fox
- jumped
- over
- the
- lazy
- dog
- diff --git a/file1 b/file1
- index 4a3cebe..30f5937 100644
- --- a/file1
- +++ b/file1
- @@ -1,9 +1,9 @@
- the
- quick
- brown
- -fox
- -jumped
- -over
- +ostrich
- +shouted
- +at
- the
- lazy
- dog
- $ git apply mypatch
- diff --git a/file1 b/file1
- index 4a3cebe..30f5937 100644
- --- a/file1
- +++ b/file1
- @@ -1,6 +1,6 @@
- the
- quick
- brown
- -fox
- -jumped
- -over
- +ostrich
- +shouted
- +at
- $ git apply diff
- error: patch failed: file1:1
- error: file1: patch does not apply
- diff --git a/file1 b/file1
- index 4a3cebe..30f5937 100644
- --- a/file1
- +++ b/file1
- @@ -1,7 +1,7 @@
- the
- quick
- brown
- -fox
- -jumped
- -over
- +ostrich
- +shouted
- +at
- the
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement