diff options
Diffstat (limited to 'Git/Merge.hs')
| -rw-r--r-- | Git/Merge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Git/Merge.hs b/Git/Merge.hs index e70a71d64..f5791274f 100644 --- a/Git/Merge.hs +++ b/Git/Merge.hs @@ -10,7 +10,7 @@ module Git.Merge where import Common import Git import Git.Command -import Git.Version +import Git.BuildVersion {- Avoids recent git's interactive merge. -} mergeNonInteractive :: Ref -> Repo -> IO Bool |