Artifact 1292fef05f2472108e874e99965997f95d1fe33b:

Ticket change [1292fef05f] - Add attachment "merge-conflict.sh" to ticket [67a47646ea] by leor 2012-02-10 05:40:55.

---

A merge-conflict.sh 67a47646ea38c7ed77112b579a6f7dce84e4eda9 3dfd51dbc112622ad82683802a692bd1ae42c718
C Self\scontained\sshell\sscript\sthat\sreproduces\sthe\sproblem.\sTested\son\sUbuntu-10.04\swith\sFossil\strunk.
D 2012-02-10T05:40:55.572
U leor
Z b19394103cdb33c9dd025a484351ef74