diff options
Diffstat (limited to 'Annex/AutoMerge.hs')
| -rw-r--r-- | Annex/AutoMerge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index e6f7e0497..22d3332dd 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -67,7 +67,7 @@ autoMergeFrom branch currbranch = do - tree. The resolution is committed. - - In direct mode, the work tree is not touched here, and no commit is made; - - files are staged to the index, and written to the gitAnnexMergeDir, and + - files are staged to the index, and written to the gitAnnexMergeDir, and - later mergeDirectCleanup handles updating the work tree. -} resolveMerge :: Maybe Git.Ref -> Git.Ref -> Annex Bool |