From: Matthieu Moy Date: Tue, 30 Jun 2015 11:46:16 GMT Subject: Re: [PATCH v11 06/10] bisect: don't mix option parsing and non-trivial code Message-ID: In-Reply-To: Junio C Hamano writes: > Matthieu, are you allowing your editor to corrupt the number of > lines in the hunk on the @@ ... @@ hunk header? "diff" mode in > Emacs does that, Indeed. There's magic in Emac's diff-mode to keep the header up to date, but it seems totally buggy. I manually deleted a tab (no line added, no line removed) and it changed the number of lines in the header. I see that you still managed to apply the series in pu, thanks and sorry for the inconvenience. -- Matthieu Moy http://www-verimag.imag.fr/~moy/