Thread (3 messages) flat view 3 messages, 3 authors, 2016-06-15

Re: A note on merging conflicts..

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:32

I suspect this has the same problem I pointed out to Kristian's 
attempt to make git-branch a built-in.

    Subject: Re: [PATCH] Implement git-branch and git-merge-base as built-ins.
    Date: Thu, 08 Jun 2006 11:53:48 -0700
    Message-ID: [ref]

Namely, merge-base code is not set up to be called more than
once without cleaning things up.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help