apply @mixvin's windows path fix at the top of the method instead
Merge remote-tracking branch 'origin/master'
fix escaping for `:edit` when renaming files