The merge conflict syntax and "doesn't destroy history" both sound exactly like what Fossil does. (Fossil is at https://fossil-scm.org/ https://fossil-scm.org/

The merge conflict syntax and "doesn't destroy history" both sound exactly like what Fossil does. (Fossil is at https://fossil-scm.org/ https://fossil-scm.org/) Just a trivial example here: lorem ipsum <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 2) dolor sit amet, ####### SUGGESTED CONFLICT RESOLUTION follows ################### consectetur adipiscing elit ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 2) ======= MERGED IN content follows =============================== (line 2) consectetur adipiscing elit >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>