unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Andreas Schwab <schwab@linux-m68k.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Chong Yidong <cyd@stupidchicken.com>, emacs-devel@gnu.org
Subject: Re: Merge in revno 100770
Date: Thu, 15 Jul 2010 19:17:34 +0200	[thread overview]
Message-ID: <m2hbk0u0k1.fsf@igel.home> (raw)
In-Reply-To: <83r5j4g0o1.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 15 Jul 2010 19:38:54 +0300")

Eli Zaretskii <eliz@gnu.org> writes:

> This merge from the emacs-23 branch:
>
>   100770: Chong Yidong 2010-07-10 [merge] Merge changes from emacs-23 branch.
>
> somehow managed to revert changes I did in fringe.c for bidi-aware
> display of continuation bitmaps on the fringes (because obviously,
> there's no such code on the branch).  Specifically, it was due to the
> merge of this bugfix commit on the branch:
>
>   99634.2.281: YAMAMOTO Mitsuharu 2010-07-05 Fix ghost buffer boundary
>                indicators in fringes (Bug#5634, Bug#6325).
>
> Do we know how could that happen?

It looks like a wrong conflict resolution.  You can see the actual
conflicts with

  git show 036075de6587c79f9b609a68ddf4be09bd3a05ef src/fringe.c

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."



  reply	other threads:[~2010-07-15 17:17 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-15 16:38 Merge in revno 100770 Eli Zaretskii
2010-07-15 17:17 ` Andreas Schwab [this message]
2010-07-15 21:37   ` Bojan Nikolic

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

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=m2hbk0u0k1.fsf@igel.home \
    --to=schwab@linux-m68k.org \
    --cc=cyd@stupidchicken.com \
    --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 public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).