From: Anders Kaseorg <andersk@mit.edu>
Date: Thu, 5 May 2011 02:23:40 +0000 (-0400)
Subject: Merge branch 'master' of git://andersk.mit.edu/test
X-Git-Url: http://andersk.mit.edu/gitweb/test.git/commitdiff_plain/HEAD?hp=23576e80dcfa43568fb8c81a71b956b36d7ae66e

Merge branch 'master' of git://andersk.mit.edu/test

Conflicts:
	test.txt
---

diff --git a/test.txt b/test.txt
index 257cc56..7601807 100644
--- a/test.txt
+++ b/test.txt
@@ -1 +1 @@
-foo
+baz