[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Need review of emacs-25-merge branch
From: |
Lars Magne Ingebrigtsen |
Subject: |
Re: Need review of emacs-25-merge branch |
Date: |
Wed, 30 Dec 2015 20:52:51 +0100 |
User-agent: |
Gnus/5.130014 (Ma Gnus v0.14) Emacs/25.1.50 (gnu/linux) |
John Wiegley <address@hidden> 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
- Re: Need review of emacs-25-merge branch, (continued)
- Re: Need review of emacs-25-merge branch, Paul Eggert, 2015/12/30
- Re: Need review of emacs-25-merge branch, Eli Zaretskii, 2015/12/30
- Re: Need review of emacs-25-merge branch, John Wiegley, 2015/12/30
- Re: Need review of emacs-25-merge branch, Lars Magne Ingebrigtsen, 2015/12/30
- Re: Need review of emacs-25-merge branch, Eli Zaretskii, 2015/12/30
- Re: Need review of emacs-25-merge branch, John Wiegley, 2015/12/30
- Re: Need review of emacs-25-merge branch, Lars Magne Ingebrigtsen, 2015/12/30
- Re: Need review of emacs-25-merge branch, Eli Zaretskii, 2015/12/30
- Re: Need review of emacs-25-merge branch, John Wiegley, 2015/12/30
- Re: Need review of emacs-25-merge branch,
Lars Magne Ingebrigtsen <=
- Re: Need review of emacs-25-merge branch, John Wiegley, 2015/12/30
- Re: Need review of emacs-25-merge branch, Paul Eggert, 2015/12/30
- Re: Need review of emacs-25-merge branch, John Wiegley, 2015/12/30
Message not available
Message not available