Re: [PATCH 1/1] Fix typo in merge-strategies documentation

Johannes Schindelin writes: > On Mon, 19 Mar 2018, Junio C Hamano wrote: > >> David Pursehouse writes: >> >> > From: David Pursehouse >> > >> > Signed-off-by: David Pursehouse >> > --- >>

Re: [PATCH 1/1] Fix typo in merge-strategies documentation

On Tue, Mar 20, 2018 at 1:51 AM, Junio C Hamano wrote: > > I somehow had to stare at the patch for a few minutes, view it in > two Emacs buffers and run M-x compare-windows before I finally spot > the single-byte typofix. > > Will queue with a retitle. [resending as plain

Re: [PATCH 1/1] Fix typo in merge-strategies documentation

Hi Junio, On Mon, 19 Mar 2018, Junio C Hamano wrote: > David Pursehouse writes: > > > From: David Pursehouse > > > > Signed-off-by: David Pursehouse > > --- > > I somehow had to stare at the patch for a few minutes,

Re: [PATCH 1/1] Fix typo in merge-strategies documentation

David Pursehouse writes: > From: David Pursehouse > > Signed-off-by: David Pursehouse > --- I somehow had to stare at the patch for a few minutes, view it in two Emacs buffers and run M-x compare-windows before I

Re: [PATCH 1/1] Fix typo in merge-strategies documentation

Hi David, On Sat, 17 Mar 2018, David Pursehouse wrote: > diff --git a/Documentation/merge-strategies.txt > b/Documentation/merge-strategies.txt > index fd5d748d1..4a58aad4b 100644 > --- a/Documentation/merge-strategies.txt > +++ b/Documentation/merge-strategies.txt > @@ -40,7 +40,7 @@ the other

[PATCH 1/1] Fix typo in merge-strategies documentation

From: David Pursehouse Signed-off-by: David Pursehouse --- Documentation/merge-strategies.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index