Index: ergh eek arf/quux bar baz
===================================================================
--- ergh eek arf/quux bar baz	(.../branch1)	(revision 4)
+++ ergh eek arf/quux bar baz	(.../branch2)	(revision 4)
@@ -1 +1 @@
-foo goo
+foo bar
Index: ergh eek arf/quux bar baz2
===================================================================
--- ergh eek arf/quux bar baz2	(.../branch1)	(revision 4)
+++ ergh eek arf/quux bar baz2	(.../branch2)	(revision 4)
@@ -1 +1 @@
-foo goo
+foo bar