Added a comment

This commit is contained in:
http://joeyh.name/ 2014-07-09 18:20:14 +00:00 committed by admin
parent 68ba0f8ab8
commit 7871699567

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.55"
subject="comment 1"
date="2014-07-09T18:20:13Z"
content="""
mergeDirect locks .git/index, so no other git command should use it while the merge is in progress.
However, if the index file is deleted, and stageMerge runs, it stages deletion of all files. So that looks likely to be part of the story.
"""]]