diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-16 16:08:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-16 16:08:53 -0400 |
| commit | 1d727e8005cf814ffa913d09b1eed04b2f6c5e12 (patch) | |
| tree | 36cfe2bae06057a4eab596a7f79f21cf6a59ea6a /doc | |
| parent | 1db28228abdc56a80e8d59b075cb6dcc486a941a (diff) | |
close
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos.mdwn | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos.mdwn b/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos.mdwn index 69364ae63..8007ae11f 100644 --- a/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos.mdwn +++ b/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos.mdwn @@ -195,3 +195,5 @@ Date: Sat Oct 12 15:09:40 2013 +0200 create mode 120000 firstfile """]] + +> Bug fixed; test case added; [[done]] --[[Joey]] |