emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Trouble merging line-numbers branch into master


From: Stefan Monnier
Subject: Re: Trouble merging line-numbers branch into master
Date: Fri, 07 Jul 2017 17:38:00 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux)

> Have you any idea what's special about those two <space><tab>s in
> cc-fonts.el that git complained about them, but not the other 2056
> occurrences?

These occurrences were in lines that have been touched somehow by
the merge: the check only looks at text lines that are modified.



        Stefan




reply via email to

[Prev in Thread] Current Thread [Next in Thread]