diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-05 17:12:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-05 17:12:05 -0400 |
| commit | 5edba1bfe62ac4e77906b5b0057280d2d616c61e (patch) | |
| tree | 9fa17a7e67fa3d3159318a4a318c55938327020f /Annex/AutoMerge.hs | |
| parent | dc7c9a5db72ff05d5eb835f2406f2626a33553df (diff) | |
assistant: Fix bug, introduced in last release, that caused the assistant to make many unncessary empty merge commits.
Diffstat (limited to 'Annex/AutoMerge.hs')
| -rw-r--r-- | Annex/AutoMerge.hs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index cc27f6b28..b5c4b911d 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -28,7 +28,11 @@ import qualified Data.Set as S {- Merges from a branch into the current branch - (which may not exist yet), - - with automatic merge conflict resolution. -} + - with automatic merge conflict resolution. + - + - Callers should use Git.Branch.changed first, to make sure that + - there are changed from the current branch to the branch being merged in. + -} autoMergeFrom :: Git.Ref -> (Maybe Git.Ref) -> Git.Branch.CommitMode -> Annex Bool autoMergeFrom branch currbranch commitmode = do showOutput |