diff options
author | 2017-11-28 14:40:26 -0400 | |
---|---|---|
committer | 2017-11-28 15:14:16 -0400 | |
commit | 699611cde5cda8b2f2d83a6d6ac9c1e575b74f51 (patch) | |
tree | b502247490779aca8068684a3be42791050eff7b /Command/ResolveMerge.hs | |
parent | bf5de3a6f3d50028f7ac47c6cde759a6f5110b08 (diff) |
showStart variant for when there's no worktree file
Clean up some uses of showStart with "" for the file,
or in some cases, a non-filename description string. That would
generate bad json, although none of the commands doing that
supported --json.
Using "" for the file resulted in output like "foo rest";
now the extra space is eliminated.
This commit was sponsored by Fernando Jimenez on Patreon.
Diffstat (limited to 'Command/ResolveMerge.hs')
-rw-r--r-- | Command/ResolveMerge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/ResolveMerge.hs b/Command/ResolveMerge.hs index 0ba6efb36..df72e24d4 100644 --- a/Command/ResolveMerge.hs +++ b/Command/ResolveMerge.hs @@ -23,7 +23,7 @@ seek = withNothing start start :: CommandStart start = do - showStart "resolvemerge" "" + showStart' "resolvemerge" Nothing us <- fromMaybe nobranch <$> inRepo Git.Branch.current d <- fromRepo Git.localGitDir let merge_head = d </> "MERGE_HEAD" |