From: Lars Magne Ingebrigtsen <larsi@gnus.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Paul Eggert <eggert@cs.ucla.edu>, emacs-devel@gnu.org
Subject: Re: Need review of emacs-25-merge branch
Date: Wed, 30 Dec 2015 20:52:51 +0100 [thread overview]
Message-ID: <m31ta34sto.fsf@gnus.org> (raw)
In-Reply-To: <m2bn97k981.fsf@newartisans.com> (John Wiegley's message of "Wed, 30 Dec 2015 11:49:34 -0800")
John Wiegley <jwiegley@gmail.com> writes:
> I was presented with the same 12 merge conflicts; it took all of 1 second to
> perform that merge; and I would have had to resolve the same conflicts in the
> same way I did when using git-imerge. Only, it would have proceeded in a
> fraction of the time.
:-)
Can you post the twelve merge conflicts? That would make it easier to
see whether the results are what we want...
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
next prev parent reply other threads:[~2015-12-30 19:52 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-30 5:50 Need review of emacs-25-merge branch John Wiegley
2015-12-30 7:46 ` Paul Eggert
2015-12-30 17:23 ` Eli Zaretskii
2015-12-30 16:20 ` Eli Zaretskii
2015-12-30 19:07 ` John Wiegley
2015-12-30 19:15 ` Lars Magne Ingebrigtsen
2015-12-30 19:26 ` Eli Zaretskii
2015-12-30 19:35 ` John Wiegley
2015-12-30 19:39 ` Lars Magne Ingebrigtsen
2015-12-30 19:59 ` Eli Zaretskii
2015-12-30 20:17 ` Lars Magne Ingebrigtsen
2015-12-30 20:52 ` Eli Zaretskii
2015-12-30 19:49 ` John Wiegley
2015-12-30 19:52 ` Lars Magne Ingebrigtsen [this message]
2015-12-30 19:59 ` John Wiegley
2016-01-02 3:32 ` Lars Magne Ingebrigtsen
2015-12-30 19:53 ` Paul Eggert
2015-12-30 19:59 ` John Wiegley
[not found] ` <CABr8ebbF7JYoGPV5gtmAuVsOWamoCdmpq+tqoLqyuoM8OYOCcg@mail.gmail.com>
[not found] ` <m2vb7gml15.fsf@newartisans.com>
2015-12-30 17:38 ` Eli Zaretskii
[not found] ` <CABr8ebacCsM15oWN55Zhg9ACBh-iy5n9nTF5wDj53=F7Ns25Jw@mail.gmail.com>
2015-12-30 19:10 ` John Wiegley
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=m31ta34sto.fsf@gnus.org \
--to=larsi@gnus.org \
--cc=eggert@cs.ucla.edu \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
/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.