[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: ESR's intimidatingly huge task list
From: |
Eric S. Raymond |
Subject: |
Re: ESR's intimidatingly huge task list |
Date: |
Sat, 11 Jan 2014 15:50:18 -0500 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
Rüdiger Sonderfeld <address@hidden>:
> On Saturday 11 January 2014 11:56:35 Eric S. Raymond wrote:
> > * Better cross-VCS integration of smerge in vc.el. Here are Stefan's
> > requirements:
> >
> > - Improve vc-git.el so that it can automatically enable smerge-mode when
> > opening a conflicted file and (probably conditional on a config var)
> > mark the file as "not conflicted any more" when saving with no
> > remaining diff3 markers.
> > This currently works in vc-bzr.el (and vc-svn.el as well, IIRC).
> >
> > - Improve vc-git.el with vc-git-conflicted-files so that
> > vc-find-conflicted-files works for Git as well.
>
> See my patch proposal:
> https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01038.html
>
> Regards,
> Rüdiger
Thanks, that will help.
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>