Re: git pull fails with merge conflicts. How can this possibly happen?

[Eli Zaretskii]

> From: "Stephen J. Turnbull" <address@hidden>
> Date: Sun, 16 Nov 2014 01:31:23 +0900
> Cc: address@hidden
> 
> David Kastrup writes:
> 
>  > Which seems like a really stupid idea since it means that address@hidden
>  > is different from @{1} but is the same as @@{1}.
> 
> No, they all mean the same thing AFAICT.

That's my conclusion as well, but you won't find that in the docs.
The description of @{n} explicitly mentions "reflog", but the
description of address@hidden only hints on that.