1. Whcih option of patch makes it insert conflicts inline into the patched file, with >>>>>>>>>>>>> ============= <<<<<<<<<<<<< markers, as svn merge does ?
2. Does gnu utilities set have 'merge' utility that can merge 3 files, with conflicts labeled as above ? Thanks
