diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-08-02 18:31:01 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-08-02 18:32:26 -0400 |
| commit | addc505584876cca50ccdcd1c982e9a5e10ec9b1 (patch) | |
| tree | 9da1fe90f8d96a038f939a9fc05d64c7af7e3369 /Git/Merge.hs | |
| parent | 5921e627d75758101ccb38f76c83c3917ae897b7 (diff) | |
better git version checking
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 |