From: Stefan Monnier <monnier@iro.umontreal.ca>
To: emacs-devel@gnu.org
Subject: Re: Trouble merging line-numbers branch into master
Date: Fri, 07 Jul 2017 17:38:00 -0400 [thread overview]
Message-ID: <jwvfue8j5dj.fsf-monnier+gmane.emacs.devel@gnu.org> (raw)
In-Reply-To: 20170707212353.GA2428@acm
> 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
next prev parent reply other threads:[~2017-07-07 21:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-07 15:43 Trouble merging line-numbers branch into master Kaushal Modi
2017-07-07 15:51 ` Noam Postavsky
2017-07-07 18:08 ` Kaushal Modi
2017-07-07 21:23 ` Alan Mackenzie
2017-07-07 21:38 ` Stefan Monnier [this message]
2017-07-07 21:41 ` Paul Eggert
2017-07-07 21:46 ` Kaushal Modi
2017-07-08 8:04 ` Eli Zaretskii
2017-07-08 12:05 ` Noam Postavsky
2017-07-08 12:46 ` Kaushal Modi
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=jwvfue8j5dj.fsf-monnier+gmane.emacs.devel@gnu.org \
--to=monnier@iro.umontreal.ca \
--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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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.