In updating the project patchset, it is not uncommon for
quilt -f to give two files that need to be manually merged (an original file and its corresponding .rej). I am wondering if there is a vim plugin or some other tool that can make the manual merge easier.
The .rej file shows diffs with the - and + sign so the plugin would allow one to split-screen the two, line them up automatically, then easily grab the blocks inserting or deleting them as they should be as if manually typed. Thanks for the suggestions.
As an example: