equal
deleted
inserted
replaced
1 % new file |
1 % new file |
2 applying patch from stdin |
2 applying patch from stdin |
|
3 0:ae3ee40d2079 |
3 % new empty file |
4 % new empty file |
4 applying patch from stdin |
5 applying patch from stdin |
|
6 1:ab199dc869b5 |
5 empty |
7 empty |
6 % chmod +x |
8 % chmod +x |
7 applying patch from stdin |
9 applying patch from stdin |
|
10 2:3a34410f282e |
8 % copy |
11 % copy |
9 applying patch from stdin |
12 applying patch from stdin |
|
13 3:37bacb7ca14d |
10 a |
14 a |
11 a |
15 a |
12 % rename |
16 % rename |
13 applying patch from stdin |
17 applying patch from stdin |
|
18 4:47b81a94361d |
14 copyx |
19 copyx |
15 empty |
20 empty |
16 new |
21 new |
17 rename |
22 rename |
18 % delete |
23 % delete |
19 applying patch from stdin |
24 applying patch from stdin |
|
25 5:d9b001d98336 |
20 empty |
26 empty |
21 new |
27 new |
22 rename |
28 rename |
23 % regular diff |
29 % regular diff |
24 applying patch from stdin |
30 applying patch from stdin |
|
31 6:ebe901e7576b |
25 % copy and modify |
32 % copy and modify |
26 applying patch from stdin |
33 applying patch from stdin |
|
34 7:18f368958ecd |
27 a |
35 a |
28 a |
36 a |
29 b |
37 b |
30 a |
38 a |
31 a |
39 a |
32 % rename and modify |
40 % rename and modify |
33 applying patch from stdin |
41 applying patch from stdin |
|
42 8:c32b0d7e6f44 |
34 a |
43 a |
35 a |
44 a |
36 b |
45 b |
37 c |
46 c |
38 a |
47 a |
39 % one file renamed multiple times |
48 % one file renamed multiple times |
40 applying patch from stdin |
49 applying patch from stdin |
|
50 9:034a6bf95330 |
41 9 rename2 rename3 rename3-2 / rename3 (rename2)rename3-2 (rename2) |
51 9 rename2 rename3 rename3-2 / rename3 (rename2)rename3-2 (rename2) |
42 rename3 |
52 rename3 |
43 rename3-2 |
53 rename3-2 |
44 a |
54 a |
45 a |
55 a |
52 b |
62 b |
53 c |
63 c |
54 a |
64 a |
55 % binary files and regular patch hunks |
65 % binary files and regular patch hunks |
56 applying patch from stdin |
66 applying patch from stdin |
|
67 11:c39bce63e786 |
57 foo |
68 foo |
58 045c85ba38952325e126c70962cc0f9d9077bc67 644 binary |
69 045c85ba38952325e126c70962cc0f9d9077bc67 644 binary |
59 % many binary files |
70 % many binary files |
60 applying patch from stdin |
71 applying patch from stdin |
|
72 12:30b530085242 |
61 045c85ba38952325e126c70962cc0f9d9077bc67 644 mbinary1 |
73 045c85ba38952325e126c70962cc0f9d9077bc67 644 mbinary1 |
62 a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2 |
74 a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2 |
63 % filenames with spaces |
75 % filenames with spaces |
64 applying patch from stdin |
76 applying patch from stdin |
|
77 13:04750ef42fb3 |
65 foo |
78 foo |
66 % copy then modify the original file |
79 % copy then modify the original file |
67 applying patch from stdin |
80 applying patch from stdin |
|
81 14:c4cd9cdeaa74 |
68 foo |
82 foo |