ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cleanup: fix formatting of commands.rs

Browse source
This commit is contained in:
Martin von Zweigbergk 2021-08-18 09:57:53 -07:00
parent b4d0549146
commit c310477765
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/commands.rs
View file

@ -1445,7 +1445,10 @@ fn cmd_status(
ui.stdout_formatter().remove_label()?; ui.stdout_formatter().remove_label()?;
writeln!(ui)?; writeln!(ui)?;
} }
writeln!(ui, " Use `jj branches` to see details. Use `jj branch <name> -r <rev>` to resolve.")?; writeln!(
ui,
" Use `jj branches` to see details. Use `jj branch <name> -r <rev>` to resolve."
)?;
} }
if !conflicted_remote_branches.is_empty() { if !conflicted_remote_branches.is_empty() {
ui.stdout_formatter().add_label("conflict".to_string())?; ui.stdout_formatter().add_label("conflict".to_string())?;
@ -1458,7 +1461,10 @@ fn cmd_status(
ui.stdout_formatter().remove_label()?; ui.stdout_formatter().remove_label()?;
writeln!(ui)?; writeln!(ui)?;
} }
writeln!(ui, " Use `jj branches` to see details. Use `jj git pull` to resolve.")?; writeln!(
ui,
" Use `jj branches` to see details. Use `jj git pull` to resolve."
)?;
} }
let summary = commit.parents()[0] let summary = commit.parents()[0]
.tree() .tree()