Ah, the whitespace that was added to enable the >>> markers to be
added... that makes sense.
Which means the output is correct and some assumptions my code makes
about the format of the Combined Diff are wrong.
Thanks!
Nick
On 8 February 2018 at 11:25, Jeff King wrote:
> On
On Thu, Feb 08, 2018 at 10:51:57AM +, Nick O'Leary wrote:
> $ git diff README.md
> diff --cc README.md
> index 61d78b2,620d806..000
> --- a/README.md
> +++ b/README.md
> @@@ -1,7 -1,1 +1,11 @@@
> -This is my default readme
> ++<<< HEAD
> +merged-history-test
> +===
2 matches
Mail list logo