-
Notifications
You must be signed in to change notification settings - Fork 3.7k
/
Copy pathgit-format-patch.expect.txt
37 lines (37 loc) · 1.89 KB
/
git-format-patch.expect.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
<span class="hljs-comment">diff --git a/file.py b/file.py</span>
<span class="hljs-comment">index 123456..789abc 100644</span>
<span class="hljs-comment">--- a/file.py</span>
<span class="hljs-comment">+++ b/file.py</span>
<span class="hljs-meta">@@ -28,2 +28,2 @@</span> import logging
<span class="hljs-addition">+ import shutil</span>
<span class="hljs-deletion">- import os</span>
<span class="hljs-comment">diff --git a/file.txt b/file.txt</span>
<span class="hljs-comment">index 123456..789abc 100644</span>
<span class="hljs-comment">--- a/file.txt</span>
<span class="hljs-comment">--- b/file.txt</span>
<span class="hljs-meta">@@ -28,2 +28,2 @@</span>
<span class="hljs-deletion">- removal</span>
<span class="hljs-addition">+ addition</span>
<span class="hljs-comment">diff --git a/file.txt b/file.txt</span>
<span class="hljs-comment">index 8baef1b..24c5735 100644</span>
<span class="hljs-comment">--- a/file.txt</span>
<span class="hljs-comment">+++ b/file.txt</span>
<span class="hljs-meta">@@ -1 +1 @@</span>
<span class="hljs-deletion">-removal</span>
<span class="hljs-addition">+addition</span>
<span class="hljs-comment">diff --git a/file.txt b/file.txt</span>
<span class="hljs-comment">index f9308d8..f39c17d 100644</span>
<span class="hljs-comment">--- a/file.txt</span>
<span class="hljs-comment">+++ b/file.txt</span>
<span class="hljs-meta">@@ -1,2 +1 @@</span>
<span class="hljs-deletion">-removal1</span>
<span class="hljs-deletion">-removal2</span>
<span class="hljs-addition">+addition</span>
<span class="hljs-comment">diff --git a/file.txt b/file.txt</span>
<span class="hljs-comment">index 1037b05..54addbd 100644</span>
<span class="hljs-comment">--- a/file.txt</span>
<span class="hljs-comment">+++ b/file.txt</span>
<span class="hljs-meta">@@ -1 +1,2 @@</span>
<span class="hljs-deletion">-removal</span>
<span class="hljs-addition">+addition1</span>
<span class="hljs-addition">+addition2</span>