# HG changeset patch
# User Pawel Solyga <Pawel.Solyga@gmail.com>
# Date 1242649365 -7200
# Node ID 5bf22cd44c19d18d6ebd78015fdcc089c1d723e2
# Parent  3eee2308f1dd2030a82740448a4a702ef9ccc28f# Parent  c058fce7c0b446f34a29234662136f86e424d37e
Merge with Sverre's accidental head.

diff -r 3eee2308f1dd -r 5bf22cd44c19 foo.txt