Artifact
721f53687e3f9c8ac6209a7ad680246965c734b9:
Ticket change
[721f53687e]
- New ticket [cdc0136de7c251b4|cdc0136de7] <i>Four-way diff</i>.
by
peter
2011-10-30 00:13:15.
D 2011-10-30T00:13:15.088
J comment Some\sway\sof\scomparing\sthe\sdifferences\sbetween\r\nr1\sand\sr2\swith\sthe\sdifferences\sbetween\sr3\sand\sr4.\r\n\r\nThis\sis\sto\scheck\sthat\se.g.\sa\smerge\sbetween\r\nbranches\shas\ssucceded.\r\n\r\nMaybe\sdo\sa\sdiff\sbetween\sr1/r2\sand\sr3/r4,\sstrip\r\nthe\stwo\sdiff\sfiles\sfrom\sline\snumber\sinfo\s(or\sapply\r\na\spreprocess\sto\sdo\sthat),\sand\sshow\sthe\stwo\r\ndiff\sfiles\sin\seskil.
J foundin 2.5
J severity Minor
J status Open
J title Four-way\sdiff
J type Feature_Request
K cdc0136de7c251b4151e92baa65ed5a1814f3e24
U peter
Z 126721ba54582a1abf34472d64447ce1