|
|
|
I think criss-cross merges usually don't have a unique correct solution.
Here is a (maybe) better picture of the example you used (since I draw
it, I might as well send it)
0 (f0) -- 1 (f1) -------- 3 (f1) ---------------------- 7 (f3)
\ \ \ / /
\ \ `------+---------------- 5 (f3) -----'
\ \ / /
\ `------ 2 (f0) /
\ `-------------+------- 6 (f2)
\ / /
`-------------------- 4 (f2)-------' |
|
| Date |
User |
Action |
Args |
| 2009-12-28 19:10:58 | tonfa | set | messageid: <1262027458.43.0.502148763718.issue1327@mercurial.selenic.com> |
| 2009-12-28 19:10:58 | tonfa | set | recipients:
+ mpm, cboos, kupfer, kiilerix, mg, parren, djc, abuehl, jcoomes, astratto, dsp, Ringding, sjtai, mjnelson, morisgi, friedrich |
| 2009-12-28 19:10:58 | tonfa | link | issue1327 messages |
| 2009-12-28 19:10:58 | tonfa | create | |
|