Artifact fc49ec98649fdd8baf40913fe1533447bbad6644:

Ticket change [fc49ec9864] - Ticket [984d15b811] Merge conflict markers could be more helpful status still Open with 1 other change by anonymous 2010-10-15 14:11:30.

---

D 2010-10-15T14:11:30
J +comment \n\n<hr\s/><i>anonymous\sadded\son\s2010-10-15\s14:11:30:</i><br\s/>\nI\sexpect\sadapting\stools\sto\shandle\sversion\son\s"==="\sharder\sthan\sadapting\scode\sthat\shandles\sthem\son\s">>>".\r\n\r\nNot\sto\smention\schanging\suser\shabits\swhen\sdoing\sthe\ssame\svisually.
K 984d15b81114087e9ebd036b70161d1f14ea75fa
U anonymous
Z 6289423fac77c1c87ae3bb24feaac4a1