From 598eb2e2daac5d2338b9788814e45bb5b2c16e61 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 30 Nov 2011 12:01:15 -0400
Subject: cleanup

---
 Annex/Branch.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index a92f05b2c..a89066881 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -186,7 +186,7 @@ tryFastForwardTo :: [Git.Ref] -> Annex Bool
 tryFastForwardTo [] = return True
 tryFastForwardTo (first:rest) = do
 	-- First, check that the git-annex branch does not contain any
-	-- new commits that are in the first other branch. If it does,
+	-- new commits that are not in the first other branch. If it does,
 	-- cannot fast-forward.
 	diverged <- changedBranch first fullname
 	if diverged
@@ -195,7 +195,8 @@ tryFastForwardTo (first:rest) = do
 	where
 		no_ff = return False
 		do_ff branch = do
-			inRepo $ Git.run "update-ref" [Param $ show fullname, Param $ show branch]
+			inRepo $ Git.run "update-ref"
+				[Param $ show fullname, Param $ show branch]
 			return True
 		findbest c [] = return $ Just c
 		findbest c (r:rs)
-- 
cgit v1.2.3