Artifact 808b07e98edd0c161b1f6b10a541724033211193:

Ticket change [808b07e98e] - New ticket [984d15b811] Merge conflict markers could be more helpful. by anonymous 2010-10-15 09:06:41.

---

D 2010-10-15T09:06:41
J comment It\sisn't\seasy\sto\sunderstand\swhich\sconflicting\sversion\sis\swhich.\r\n\r\nCVS\sputs\sversion\sinformation\sinto\smarkers:\r\n<pre>\r\n<<<<<<<\sPLIST\r\n@comment\s$NetBSD$\r\n=======\r\n@comment\s$NetBSD:\sPLIST,v\s1.28\s2010/09/13\s12:43:16\sasau\sExp\s$\r\n>>>>>>>\s1.28\r\n</pre>\r\nmeaning\sthat\sthe\stext\sbelow\sthe\sopening\smarker\sis\sfresh,\r\nand\sthe\stext\sabove\sthe\sclosing\smarker\scomes\sfrom\srevision\s1.28.\r\n\r\nIt\swould\sbe\snice\sto\ssee\sFossil\sbehaving\sin\sa\ssimilar\sway,\se.g.\sputting\sversion\sid\sand/or\stime\sstamp\sin\sconflict\smarker.
J private_contact 77d1fb9b8673fda6e5de8f02a6ad22d96857b3e1
J severity Minor
J status Open
J title Merge\sconflict\smarkers\scould\sbe\smore\shelpful
J type Feature_Request
K 984d15b81114087e9ebd036b70161d1f14ea75fa
U anonymous
Z 76d344d445304185a7c82151ae640b15