diff options
author | 2014-03-03 14:57:16 -0400 | |
---|---|---|
committer | 2014-03-03 14:57:16 -0400 | |
commit | a9067868a8594577ead2ecbe55f9563bef12f26d (patch) | |
tree | 1694cea1754589a7cf0d8ed3096e03d9d430b99d /doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn | |
parent | 8d6edac6f48a4bf1522b68a30db579193c097e7a (diff) |
sync: Fix bug in direct mode that caused a file not checked into git to be deleted when merging with a remote that added a file by the same name. (Thanks, jkt)
Diffstat (limited to 'doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn')
0 files changed, 0 insertions, 0 deletions