From addc505584876cca50ccdcd1c982e9a5e10ec9b1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 2 Aug 2013 18:31:01 -0400 Subject: better git version checking --- Git/Merge.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Git/Merge.hs') 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 -- cgit v1.2.3