Simple merge tool which lets you select diff types to merge.
Pass specific lines to merge, additionally to selected modes.
Added new side-by-side with form renderer for submitting into Merge.
Fixed and improved line-wise merging.