Re: Merge in revno 100770

[Andreas Schwab]

Eli Zaretskii <address@hidden> 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, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."