diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-01-17 21:19:00 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-01-17 21:19:00 -0400 |
| commit | 293170d524af06d14f4b8b0ad7c3f092185a3e9b (patch) | |
| tree | ccdbe562454c990a10878e336e006c797edc9053 /Command/Move.hs | |
| parent | b6aca91f02474aec8359dd5472f4ada929925f98 (diff) | |
sync: Automatic merge conflict resolution now stages deleted files.
Diffstat (limited to 'Command/Move.hs')
0 files changed, 0 insertions, 0 deletions