mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-10 14:26:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 23

jj status: show same output as jj resolve --list for conflicts

Browse source 
Screnshot: https://user-images.githubusercontent.com/4123047/211169647-773b2e08-dade-4aa4-9a60-f3a3e7c08084.png
This commit is contained in:
Ilya Grigoriev 2023-01-07 12:35:54 -08:00
parent fc9795e902
commit a022beedd7
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/commands.rs
View file

@ -1540,9 +1540,7 @@ fn cmd_status(
formatter.with_label("conflict", |formatter| { formatter.with_label("conflict", |formatter| {
writeln!(formatter, "There are unresolved conflicts at these paths:") writeln!(formatter, "There are unresolved conflicts at these paths:")
})?; })?;
for (path, _) in conflicts { print_conflicted_paths(&conflicts, &tree, formatter, &workspace_command)?
writeln!(formatter, "{}", &workspace_command.format_file_path(&path))?;
}
} }
} }