From 1f39ffce019bdd2ccc187eef21bcc12ae8fbd211 Mon Sep 17 00:00:00 2001
From: Ilya Grigoriev <ilyagr@users.noreply.github.com>
Date: Wed, 4 Jan 2023 23:51:28 -0800
Subject: [PATCH] Rename print_conflicted_{files=>paths}

---
 src/commands.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/commands.rs b/src/commands.rs
index d6f9e1b24..6d206bad8 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -2397,7 +2397,7 @@ fn cmd_resolve(
         )));
     }
     if args.list {
-        return print_conflicted_files(
+        return print_conflicted_paths(
             &conflicts,
             ui.stdout_formatter().as_mut(),
             &workspace_command,
@@ -2423,7 +2423,7 @@ fn cmd_resolve(
         let new_conflicts = new_tree.conflicts_matching(&EverythingMatcher);
         if !new_conflicts.is_empty() {
             ui.write("After this operation, some files at this revision still have conflicts:\n")?;
-            print_conflicted_files(
+            print_conflicted_paths(
                 &new_conflicts,
                 ui.stdout_formatter().as_mut(),
                 &workspace_command,
@@ -2433,7 +2433,7 @@ fn cmd_resolve(
     Ok(())
 }
 
-fn print_conflicted_files(
+fn print_conflicted_paths(
     conflicts: &[(RepoPath, jujutsu_lib::backend::ConflictId)],
     formatter: &mut dyn Formatter,
     workspace_command: &WorkspaceCommandHelper,