diff options
author | Joey Hess <joey@kitenet.net> | 2011-07-19 14:07:23 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-07-19 14:07:23 -0400 |
commit | 00153eed48a2328969cc08688ef674a4c19c2014 (patch) | |
tree | f2ee8ac90225d1d2329f45b43061b53b7757d815 /Branch.hs | |
parent | ec9e9343d9fa99b0786ee93ff142484e2402d3c8 (diff) |
unify elipsis handling
And add a simple dots-based progress display, currently only used in v2
upgrade.
Diffstat (limited to 'Branch.hs')
-rw-r--r-- | Branch.hs | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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. |