From 00153eed48a2328969cc08688ef674a4c19c2014 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Jul 2011 14:07:23 -0400 Subject: unify elipsis handling And add a simple dots-based progress display, currently only used in v2 upgrade. --- Branch.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Branch.hs') diff --git a/Branch.hs b/Branch.hs index c8e6bc2bb..35e305093 100644 --- a/Branch.hs +++ b/Branch.hs @@ -190,7 +190,7 @@ updateRef ref if null diffs then return Nothing else do - showSideAction $ "merging " ++ shortref ref ++ " into " ++ name ++ "..." + showSideAction $ "merging " ++ shortref ref ++ " into " ++ name -- By passing only one ref, it is actually -- merged into the index, preserving any -- changes that may already be staged. -- cgit v1.2.3