diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-06-09 20:10:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-09 20:10:12 -0400 |
| commit | 2ca723a7c1c1130465b21d7db23c137976f58f6f (patch) | |
| tree | 15c4e176efd734f26610b03e65eb37313050ca0c /Annex/AutoMerge.hs | |
| parent | 35b79079e4cdd8534ae8d8868b46b3ad00a8ba64 (diff) | |
avoid fast-forwarding when a merge conflict was auto-resolved
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 |