# HG changeset patch
# User Christian Urban <christian dot urban at kcl dot ac dot uk>
# Date 1401447957 -3600
# Node ID 4d27b38de118f9b827f58b09508d1ffb785ffb8d
# Parent  e04123f4bacc84f908948c9feb6a5192ed88d4eb# Parent  57d89c29c81233011f8fd489ea733f6b62abf019
merged

diff -r e04123f4bacc -r 4d27b38de118 test.txt