Martin von Zweigbergk ddb07e639c merge_tools: simplify error message for complex conflicts
Since e48ace56d1e9, the number of adds in the hunk is always exactly
one more than enumber of removes, so we can simplify the condition and
the error message accordingly.
2023-06-07 13:45:16 -07:00
..
2023-01-18 10:10:02 -08:00
2023-06-05 11:11:17 -05:00