From a022beedd79c72fa5a7f4853843268eaedacdc8c Mon Sep 17 00:00:00 2001
From: Ilya Grigoriev <ilyagr@users.noreply.github.com>
Date: Sat, 7 Jan 2023 12:35:54 -0800
Subject: [PATCH] `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
---
 src/commands.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/commands.rs b/src/commands.rs
index 591fb0d08..60c51eee5 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -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)?
         }
     }