mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-08 21:48:08 +00:00
jj status
: show same output as jj resolve --list
for conflicts
Screnshot: https://user-images.githubusercontent.com/4123047/211169647-773b2e08-dade-4aa4-9a60-f3a3e7c08084.png
This commit is contained in:
parent
fc9795e902
commit
a022beedd7
1 changed files with 1 additions and 3 deletions
|
@ -1540,9 +1540,7 @@ fn cmd_status(
|
|||
formatter.with_label("conflict", |formatter| {
|
||||
writeln!(formatter, "There are unresolved conflicts at these paths:")
|
||||
})?;
|
||||
for (path, _) in conflicts {
|
||||
writeln!(formatter, "{}", &workspace_command.format_file_path(&path))?;
|
||||
}
|
||||
print_conflicted_paths(&conflicts, &tree, formatter, &workspace_command)?
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue