diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg <Tim@web> | 2013-11-14 16:21:12 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2013-11-14 16:21:12 +0000 |
| commit | 67e78a32b37e64ad4b33b6d78968186ca11f7ad1 (patch) | |
| tree | efe8d9b7dab22131f7bc274c8ba54e5240cca01f /doc | |
| parent | e7e39d951ee653da6ad5e402adc2dedec110ae0a (diff) | |
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn b/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn index 857603bed..5b817e214 100644 --- a/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn +++ b/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn @@ -1,5 +1,5 @@ ### Please describe the problem. -Minor issue. +(Minor issue.) Incorrect merge of direct repos in the special case where at repo A a symlink to a file whose contents aren't yet available, are overwritten, while at repo B the file is deleted. |