Personally, I use smerge-mode in Emacs for Git. Dmitry Alexandrov writes:
> Taylan Kammer <[email protected]> wrote: >> On 28.10.2019 00:51, Richard Stallman wrote: >>> Is it possible to write a front-end for Git which reliably handles merge >>> conflicts the way CVS handles them? >> >> I don't know how CVS handles merge conflicts > > Well, IIRC, the same way git-merge(1) does¹: by creating a file with <<<<<<< > ======= >>>>>>> marks. > > - > ¹ Speaking historically, the other way round, of course. -- GNU Powered it GPL Protected it GOD Blessed it HFG - NalaGinrut Fingerprint F53B 4C56 95B5 E4D5 6093 4324 8469 6772 846A 0058
signature.asc
Description: PGP signature
