t / t5100 / patch0002on commit t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts (c696606)
   1---
   2 foo |    2 +-
   3 1 files changed, 1 insertions(+), 1 deletions(-)
   4
   5diff --git a/foo b/foo
   6index 9123cdc..918dcf8 100644
   7--- a/foo
   8+++ b/foo
   9@@ -1 +1 @@
  10-Fri Jun  9 00:44:04 PDT 2006
  11+Fri Jun  9 00:44:13 PDT 2006
  12-- 
  131.4.0.g6f2b
  14