#
#
# add_file "tests/automate_show_conflicts/expected-duplicate-add-rename.stdout"
#  content [5e240dbd44a387642e5e8d9304c9c9ca566ee19a]
# 
# add_file "tests/automate_show_conflicts/expected-duplicate-adds.stdout"
#  content [397734596a6b5623ffc083398075e8c03566b1ab]
# 
# add_file "tests/automate_show_conflicts/expected-duplicate-renames.stdout"
#  content [b5b35f40ad20e034fdbc82c373babdb738d03a46]
#
============================================================
--- tests/automate_show_conflicts/expected-duplicate-add-rename.stdout	5e240dbd44a387642e5e8d9304c9c9ca566ee19a
+++ tests/automate_show_conflicts/expected-duplicate-add-rename.stdout	5e240dbd44a387642e5e8d9304c9c9ca566ee19a
@@ -0,0 +1,13 @@
+    left [446ea80c3f78fca1cfdb84aad55939f4e635ddc0]
+   right [367cb265f641ead9834f497ff3cbcb2b85ffe1fa]
+ancestor [d9ff68aa530d581731b0e5739b3494963cd89e91]
+
+        conflict "duplicate name"
+       left_type "renamed file"
+   ancestor_name "foo"
+ancestor_file_id [c6864a8456855c48afe83488a47501fe8b94bd57]
+       left_name "bar"
+    left_file_id [c6864a8456855c48afe83488a47501fe8b94bd57]
+      right_type "added file"
+      right_name "bar"
+   right_file_id [c809d71002ec57a2f1d10221f05993012a491436]
============================================================
--- tests/automate_show_conflicts/expected-duplicate-adds.stdout	397734596a6b5623ffc083398075e8c03566b1ab
+++ tests/automate_show_conflicts/expected-duplicate-adds.stdout	397734596a6b5623ffc083398075e8c03566b1ab
@@ -0,0 +1,11 @@
+    left [36e62406e9792ad64f7af73c5192d2e4e53306c8]
+   right [2b96f8e6ed2bb566c22ebcbdd06d34d1043c237f]
+ancestor [56cafb3485be6d40923bacaddcd19cde63433028]
+
+     conflict "duplicate name"
+    left_type "added file"
+    left_name "bar"
+ left_file_id [ba4637112ee3e55a6106d647d6c4e04a6643f8eb]
+   right_type "added file"
+   right_name "bar"
+right_file_id [fe6d523f607e2f2fc0f0defad3bda0351a95a337]
============================================================
--- tests/automate_show_conflicts/expected-duplicate-renames.stdout	b5b35f40ad20e034fdbc82c373babdb738d03a46
+++ tests/automate_show_conflicts/expected-duplicate-renames.stdout	b5b35f40ad20e034fdbc82c373babdb738d03a46
@@ -0,0 +1,15 @@
+    left [1fc2275efef8645a25e267ae47686e57e50ca1e1]
+   right [497d6e99c8b79ef5848aa862154f496432f07709]
+ancestor [680280e4dcc9fcf60721e6ac9157d98ac5f94c37]
+
+        conflict "duplicate name"
+       left_type "renamed file"
+   ancestor_name "foo"
+ancestor_file_id [918f3642b57a5e2dd13ee874e3dc2518a53ab4b4]
+       left_name "abc"
+    left_file_id [918f3642b57a5e2dd13ee874e3dc2518a53ab4b4]
+      right_type "renamed file"
+   ancestor_name "bar"
+ancestor_file_id [bdf46a521d5f1dd54c31dda15e99ff6b0c80394a]
+      right_name "abc"
+   right_file_id [bdf46a521d5f1dd54c31dda15e99ff6b0c80394a]