diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-09 14:50:42 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-09 14:50:42 -0400 |
| commit | 32a2bf7d2050f8d639e41645069d745f7b7d56a3 (patch) | |
| tree | 2d7449e0918950bf6d8c3b735cf9980300504dc0 /doc | |
| parent | cf9c2159976bad92160459d2a52a20850728b842 (diff) | |
format
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/bad_merge_commit_deleting_all_files/comment_3_be42de12faf15562265ad6cf8964f5db._comment | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/bugs/bad_merge_commit_deleting_all_files/comment_3_be42de12faf15562265ad6cf8964f5db._comment b/doc/bugs/bad_merge_commit_deleting_all_files/comment_3_be42de12faf15562265ad6cf8964f5db._comment index d5a09dc21..dd689eae7 100644 --- a/doc/bugs/bad_merge_commit_deleting_all_files/comment_3_be42de12faf15562265ad6cf8964f5db._comment +++ b/doc/bugs/bad_merge_commit_deleting_all_files/comment_3_be42de12faf15562265ad6cf8964f5db._comment @@ -4,7 +4,7 @@ subject="theory" date="2014-07-09T18:31:07Z" content=""" -Suppose we have 2 mergeDirect's (A and B) running at the same time somehow, with B around 3 seconds behind A, and this sequence of events occurs: +Suppose we have 2 mergeDirect's A and B running at the same time somehow, with B around 3 seconds behind A, and this sequence of events occurs: 1. A copies index file to index.lock 2. A stages an empty commit |