diff options
Diffstat (limited to 'doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn')
| -rw-r--r-- | doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn b/doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn index 4b5a9d2a3..081dd414b 100644 --- a/doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn +++ b/doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn @@ -10,3 +10,5 @@ is not checked into git, the merge will overwrite it with the remote file from g New problem: If the merge pulls in a directory, and a file exists with the name of the directory, locally, not annexed, the file is left alone, but the directory is thus not checked out, and will be deleted on commit. + +> [[fixed|done]]; regression test in place. --[[Joey]] |