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/f8ad600084f38795053405fc7fbcbac8c80337e8

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

Conflicts:
	test.txt
---

f8ad600084f38795053405fc7fbcbac8c80337e8
diff --cc test.txt
index 5716ca5,257cc56..7601807
--- a/test.txt
+++ b/test.txt
@@@ -1,1 -1,1 +1,1 @@@
- bar
 -foo
++baz