diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-14 14:18:15 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-14 14:18:15 -0400 |
| commit | 12812225b5bc7d8b54722c6b4082e5e753a4ff3f (patch) | |
| tree | 7a6532cf0702962cc298d370b6848c59975e5ac4 | |
| parent | 3e3c6597cf226803b93fd661fd3ee43dc7d630f0 (diff) | |
add a note after successful conflicted merge resolution
| -rw-r--r-- | Command/Sync.hs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index beb1e1a39..e5ab4cf4b 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -321,6 +321,7 @@ resolveMerge = do , Param "-m" , Param "git-annex automatic merge conflict fix" ] + showLongNote "Merge conflict was automatically resolved; you may want to examine the result." return merged resolveMerge' :: LsFiles.Unmerged -> Annex (Maybe FilePath) |