Index: branches/feature-rebase/a.txt
===================================================================
--- branches/feature-rebase/a.txt	(revision 80)
+++ branches/feature-rebase/a.txt	(revision 80)
@@ -0,0 +1,1 @@
+A
Index: branches/feature-rebase/d.txt
===================================================================
--- branches/feature-rebase/d.txt	(revision 80)
+++ branches/feature-rebase/d.txt	(revision 80)
@@ -0,0 +1,1 @@
+d1d