Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/cygwin-apps/calm.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'test/testdata/conflict/homedir.expected')
-rw-r--r--test/testdata/conflict/homedir.expected14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/testdata/conflict/homedir.expected b/test/testdata/conflict/homedir.expected
index 0cb25e1..0c84693 100644
--- a/test/testdata/conflict/homedir.expected
+++ b/test/testdata/conflict/homedir.expected
@@ -1,9 +1,9 @@
{'.': [],
'Blooey McFooey': [],
- 'Blooey McFooey/x86': [],
- 'Blooey McFooey/x86/release': [],
- 'Blooey McFooey/x86/release/staleversion': ['staleversion-230-1-src.hint',
- 'staleversion-230-1-src.hint.bak',
- 'staleversion-230-1-src.tar.xz',
- 'staleversion-230-1.hint',
- 'staleversion-230-1.tar.xz']}
+ 'Blooey McFooey/x86_64': [],
+ 'Blooey McFooey/x86_64/release': [],
+ 'Blooey McFooey/x86_64/release/staleversion': ['staleversion-230-1-src.hint',
+ 'staleversion-230-1-src.hint.bak',
+ 'staleversion-230-1-src.tar.xz',
+ 'staleversion-230-1.hint',
+ 'staleversion-230-1.tar.xz']}