threewayconflict.dpatch

4 patches for repository /tmp/tmp5605/temp/empty-hashed:

Sat Oct 16 23:28:14 BST 2010  tester
  * wibble

Sat Oct 16 23:28:14 BST 2010  tester
  * A

Sat Oct 16 23:28:14 BST 2010  tester
  * B

Sat Oct 16 23:28:14 BST 2010  tester
  * 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
] merger 0.0 (
hunk ./wibble 2
+A
hunk ./wibble 2
+B
)
[C
tester**20101016222814
 Ignore-this: 9d40b33ef1b73b9a950f39c4e8a75dfe
] merger 0.0 (
merger 0.0 (
hunk ./wibble 2
+A
hunk ./wibble 2
+B
)
merger 0.0 (
hunk ./wibble 2
+A
hunk ./wibble 2
+C
)
)

Context:

Patch bundle hash:
c189b5635aed28be92cfbcf0de65c0f40c79da7a