2013-10-13 08:56:02 +00:00 · 2013-10-13 08:56:02 +00:00 · 1d4f1d5170
commit 1d4f1d5170
parent 8a03566099
1 changed files with 1 additions and 1 deletions
--- 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
@ -1,7 +1,7 @@
 ### Please describe the problem.
 Data loss due to incorrect merge of repos in direct mode.

-Given 2 repos A and B, in direct mode, where a has no remotes and b has a as remote (not sure if the latter is relevant):
+Given 2 repos A and B, in direct mode:
 1. in A: mkdir f, with a file f in it
 2. in B: touch f
 3. in B: sync