From: Olivier Marin <dkr+ml.git@free.fr>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] builtin-rerere: fix conflict markers parsing
Date: Mon, 07 Jul 2008 16:44:41 +0200 [thread overview]
Message-ID: <48722BD9.4090406@free.fr> (raw)
In-Reply-To: <alpine.DEB.1.00.0807071505470.18205@racer>
Johannes Schindelin a écrit :
>
> Okay, but then the obvious question is: what do you do about "<<<<<<"
> lines that are not a marker?
The answer is the same.
> Same remark as before: if you fix rerere, why not do it properly?
If you have a better fix send a patch or at least give me some clues.
Olivier.
next prev parent reply other threads:[~2008-07-07 14:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-07 12:42 [PATCH] builtin-rerere: fix conflict markers parsing Olivier Marin
2008-07-07 13:02 ` Johannes Schindelin
2008-07-07 13:55 ` Olivier Marin
2008-07-07 14:06 ` Johannes Schindelin
2008-07-07 14:44 ` Olivier Marin [this message]
2008-07-07 15:29 ` Johannes Schindelin
2008-07-07 17:39 ` Junio C Hamano
2008-07-08 7:52 ` Re* " Junio C Hamano
2008-07-08 10:42 ` Olivier Marin
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=48722BD9.4090406@free.fr \
--to=dkr+ml.git@free.fr \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
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.