diff options
Diffstat (limited to 'Annex/Locations.hs')
| -rw-r--r-- | Annex/Locations.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Annex/Locations.hs b/Annex/Locations.hs index 4c2816fa9..52753fca8 100644 --- a/Annex/Locations.hs +++ b/Annex/Locations.hs @@ -291,7 +291,8 @@ gitAnnexFeedStateDir r = addTrailingPathSeparator $ gitAnnexDir r </> "feedstate gitAnnexFeedState :: Key -> Git.Repo -> FilePath gitAnnexFeedState k r = gitAnnexFeedStateDir r </> keyFile k -{- .git/annex/merge/ is used for direct mode merges. -} +{- .git/annex/merge/ is used as a empty work tree for direct mode merges and + - merges in adjusted branches. -} gitAnnexMergeDir :: Git.Repo -> FilePath gitAnnexMergeDir r = addTrailingPathSeparator $ gitAnnexDir r </> "merge" |