equal
deleted
inserted
replaced
164 1c1 |
164 1c1 |
165 < d1/b |
165 < d1/b |
166 --- |
166 --- |
167 > d2/b |
167 > d2/b |
168 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
168 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
169 # attempt to move one file into a non-existent directory |
|
170 abort: destination dx/ is not a directory |
|
171 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
169 # attempt to move potentially more than one file into a non-existent |
172 # attempt to move potentially more than one file into a non-existent |
170 # directory |
173 # directory |
171 abort: with multiple sources, destination must be an existing directory |
174 abort: with multiple sources, destination must be an existing directory |
172 # move every file under d1 to d2/d21 (glob) |
175 # move every file under d1 to d2/d21 (glob) |
173 copying d1/a to d2/d21/a |
176 copying d1/a to d2/d21/a |