From: "Eric S. Raymond" <esr@thyrsus.com>
To: "Rüdiger Sonderfeld" <ruediger@c-plusplus.de>
Cc: emacs-devel@gnu.org
Subject: Re: ESR's intimidatingly huge task list
Date: Sat, 11 Jan 2014 15:50:18 -0500 [thread overview]
Message-ID: <20140111205018.GA17111@thyrsus.com> (raw)
In-Reply-To: <1836151.BLPShGdEM7@descartes>
Rüdiger Sonderfeld <ruediger@c-plusplus.de>:
> 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>
next prev parent reply other threads:[~2014-01-11 20:50 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-11 16:56 ESR's intimidatingly huge task list Eric S. Raymond
2014-01-11 17:46 ` Bozhidar Batsov
2014-01-11 18:10 ` Rüdiger Sonderfeld
2014-01-11 18:26 ` Andreas Schwab
2014-01-23 18:47 ` Rüdiger Sonderfeld
2014-01-23 19:22 ` Eric S. Raymond
2014-01-24 8:56 ` Bozhidar Batsov
2014-01-23 19:25 ` Andreas Schwab
2014-01-11 18:07 ` Rüdiger Sonderfeld
2014-01-11 20:50 ` Eric S. Raymond [this message]
2014-01-15 17:31 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140111205018.GA17111@thyrsus.com \
--to=esr@thyrsus.com \
--cc=emacs-devel@gnu.org \
--cc=ruediger@c-plusplus.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.