comparison AUTHORS @ 26776:142d6aa7c470

New file. Provides a simple minor-mode for files containing diff3-style conflict markers, such as generated by RCS
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 09 Dec 1999 13:00:21 +0000
parents b3e40f2a7784
children fa166d86d278
comparison
equal deleted inserted replaced
26775:ea2b51ce35a7 26776:142d6aa7c470