equal
deleted
inserted
replaced
211 # forced overwrite of an existing file |
211 # forced overwrite of an existing file |
212 A d1/ca |
212 A d1/ca |
213 d1/ba |
213 d1/ba |
214 R d1/ba |
214 R d1/ba |
215 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
215 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
216 # attempt to overwrite an existing broken symlink |
|
217 d1/ca: not overwriting - file exists |
|
218 ? d1/ca |
|
219 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
216 # replace a symlink with a file |
220 # replace a symlink with a file |
217 A d1/ca |
221 A d1/ca |
218 d1/ba |
222 d1/ba |
219 R d1/ba |
223 R d1/ba |
220 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
224 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |