Advertisement
Guest User

Untitled

a guest
Jun 16th, 2019
87
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.04 KB | None | 0 0
  1. @@ -116,8 +116,8 @@
  2. context
  3. context
  4. - remove 1
  5. - remove 2
  6. - remove 3
  7. + add 1
  8. + add 2
  9. + add 3
  10. context
  11. context
  12. context
  13.  
  14. @@ -116,4 +116,4 @@
  15. context
  16. context
  17. - remove 1
  18. - remove 2
  19. + add 1
  20. + add 2
  21.  
  22. the
  23. quick
  24. brown
  25. fox
  26. jumped
  27. over
  28. the
  29. lazy
  30. dog
  31.  
  32. diff --git a/file1 b/file1
  33. index 4a3cebe..30f5937 100644
  34. --- a/file1
  35. +++ b/file1
  36. @@ -1,9 +1,9 @@
  37. the
  38. quick
  39. brown
  40. -fox
  41. -jumped
  42. -over
  43. +ostrich
  44. +shouted
  45. +at
  46. the
  47. lazy
  48. dog
  49.  
  50. $ git apply mypatch
  51.  
  52. diff --git a/file1 b/file1
  53. index 4a3cebe..30f5937 100644
  54. --- a/file1
  55. +++ b/file1
  56. @@ -1,6 +1,6 @@
  57. the
  58. quick
  59. brown
  60. -fox
  61. -jumped
  62. -over
  63. +ostrich
  64. +shouted
  65. +at
  66.  
  67. $ git apply diff
  68. error: patch failed: file1:1
  69. error: file1: patch does not apply
  70.  
  71. diff --git a/file1 b/file1
  72. index 4a3cebe..30f5937 100644
  73. --- a/file1
  74. +++ b/file1
  75. @@ -1,7 +1,7 @@
  76. the
  77. quick
  78. brown
  79. -fox
  80. -jumped
  81. -over
  82. +ostrich
  83. +shouted
  84. +at
  85. the
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement