From 6cddda4143d00e3a153d9cfbb567b11306677d11 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 16 Sep 2012 18:53:13 -0400
Subject: make the merger merge any equivilant sync branch into the current
 branch

Not just synced/master, but synced/UUID/master, for example
---
 Git/Ref.hs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'Git')

diff --git a/Git/Ref.hs b/Git/Ref.hs
index ee2f02187..021dbe6cc 100644
--- a/Git/Ref.hs
+++ b/Git/Ref.hs
@@ -26,7 +26,6 @@ base = Ref . remove "refs/heads/" . remove "refs/remotes/" . show
 			| prefix `isPrefixOf` s = drop (length prefix) s
 			| otherwise = s
 
-
 {- Given a directory such as "refs/remotes/origin", and a ref such as
  - refs/heads/master, yields a version of that ref under the directory,
  - such as refs/remotes/origin/master. -}
-- 
cgit v1.2.3