20
20
* Merging add of a new file clashing with an existing file doesn't
21
21
work; add gets an error that it's already versioned and the merge
24
24
* Merge should ignore the destination's working directory, otherwise
25
25
we get an error about the statcache when pulling from a remote