equal
deleted
inserted
replaced
1 % new file |
1 % new file |
2 applying patch from stdin |
2 applying patch from stdin |
3 patching file new |
|
4 % chmod +x |
3 % chmod +x |
5 applying patch from stdin |
4 applying patch from stdin |
6 % copy |
5 % copy |
7 applying patch from stdin |
6 applying patch from stdin |
8 a |
7 a |
12 copyx |
11 copyx |
13 new |
12 new |
14 rename |
13 rename |
15 % delete |
14 % delete |
16 applying patch from stdin |
15 applying patch from stdin |
17 patching file copyx |
|
18 new |
16 new |
19 rename |
17 rename |
20 % regular diff |
18 % regular diff |
21 applying patch from stdin |
19 applying patch from stdin |
22 patching file rename |
|
23 % copy and modify |
20 % copy and modify |
24 applying patch from stdin |
21 applying patch from stdin |
25 patching file copy2 |
|
26 a |
22 a |
27 a |
23 a |
28 b |
24 b |
29 a |
25 a |
30 a |
26 a |
31 % rename and modify |
27 % rename and modify |
32 applying patch from stdin |
28 applying patch from stdin |
33 patching file rename2 |
|
34 copy2: No such file or directory |
29 copy2: No such file or directory |
35 a |
30 a |
36 a |
31 a |
37 b |
32 b |
38 c |
33 c |