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
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
4 patches for repository /tmp/tmp5605/temp/empty-darcs2:
patch 8d6bfafe7ac2a628340563d92917da9639a8d509
Author: tester
Date: Sat Oct 16 23:28:14 BST 2010
* wibble
patch c0a55ca9dedb993d05d2779ca4f72984e87083cd
Author: tester
Date: Sat Oct 16 23:28:14 BST 2010
* A
patch fb027d809948379ca6357d654a6ce8cf45235dfa
Author: tester
Date: Sat Oct 16 23:28:14 BST 2010
* B
patch 7eeb8289feadd843a19485f493235566a2c48bea
Author: tester
Date: Sat Oct 16 23:28:14 BST 2010
* C
New patches:
[wibble
tester**20101016222814
Ignore-this: c125275c671c210086eccb12de9f6c1c
] addfile ./wibble
hunk ./wibble 1
+wibble
[A
tester**20101016222814
Ignore-this: 653be63c1f8a6f4bc1de1e45c0ae9084
] hunk ./wibble 2
wibble
+A
[B
tester**20101016222814
Ignore-this: 1a8e3f57d2baeca09f2dda003e4df58d
] conflictor [
hunk ./wibble 2
+A
]
:
hunk ./wibble 2
+B
[C
tester**20101016222814
Ignore-this: 9d40b33ef1b73b9a950f39c4e8a75dfe
] conflictor {{
:
hunk ./wibble 2
+A
:
hunk ./wibble 2
+B
}} []
:
hunk ./wibble 2
+C
Context:
Patch bundle hash:
ba3e1ce15840fd37358fcd43c4c03273d1779153
|
