pijul_org / pijul

#335 distinguishing zombie conflicts

Opened by rohan, on November 24, 2018
Open
rohan commented on November 24, 2018

I've had some complex conflicts and it was hard to recognise parts which were zombies. It certainly confused smerge-ediff.\r + \r + This patch changes the zombie conflict markers to pluses and minuses and ensures that they nest correctly within normal conflicts.

rohan commented on February 23, 2019

Rewritten to work with the latest conflict fixes as it wasn't possible to merge the original patches due to memory exhaustion on my machine with 4GB.

rohan commented on February 23, 2019

Something seems to go wrong adding the patches here. See https://nest.pijul.com/rohan/pijul:zombies