|
2011-10-30
| ||
| 00:13 | • New ticket [cdc0136de7] Four-way diff. artifact: 721f53687e user: peter | |
| Ticket Hash: | cdc0136de7c251b4151e92baa65ed5a1814f3e24 | ||
| Title: | Four-way diff | ||
| Status: | Open | Type: | Feature_Request |
| Severity: | Minor | Priority: | |
| Subsystem: | Resolution: | ||
| Last Modified: |
2011-10-30 00:13:15 13.55 years ago |
Created: |
2011-10-30 00:13:15 13.55 years ago |
| Version Found In: | 2.5 | ||
| Description: | ||||
|
Some way of comparing the differences between
r1 and r2 with the differences between r3 and r4.
This is to check that e.g. a merge between branches has succeded. Maybe do a diff between r1/r2 and r3/r4, strip the two diff files from line number info (or apply a preprocess to do that), and show the two diff files in eskil. | ||||