On Thu, 2012-06-28 at 16:58 +0200, Jan Zelený wrote:
Dne pondělí 25 června 2012 15:20:51, Stephen Gallagher napsal(a):
> In addition to failing when option maps differ, we should also print
> what we got versus what was expected.
>
> This patch has made it easier to keep my WIP branches in sync with
> master.
Obvious Ack
Pushed to master.