From f7f08cbe77007b5532f3e980c621e183a8303c74 Mon Sep 17 00:00:00 2001
From: Yuya Nishihara <yuya@tcha.org>
Date: Wed, 25 Oct 2023 15:30:07 +0900
Subject: [PATCH] templater: consistently use double ?? to denote conflicted
 refs

I think this is just a remainder of 65de7cb0eb0c "`jj log`: Change conflicted
branches from `br?` to `br??`."
---
 cli/src/commit_templater.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/src/commit_templater.rs b/cli/src/commit_templater.rs
index e60cc9de1..ef95ac789 100644
--- a/cli/src/commit_templater.rs
+++ b/cli/src/commit_templater.rs
@@ -385,7 +385,7 @@ fn build_branches_index(repo: &dyn Repo) -> RefNamesIndex {
         }
         for (remote_name, remote_ref) in unsynced_remote_refs {
             let decorated_name = if remote_ref.target.has_conflict() {
-                format!("{branch_name}@{remote_name}?")
+                format!("{branch_name}@{remote_name}??")
             } else {
                 format!("{branch_name}@{remote_name}")
             };
@@ -401,7 +401,7 @@ fn build_ref_names_index<'a>(
     let mut index = RefNamesIndex::default();
     for (name, target) in ref_pairs {
         let decorated_name = if target.has_conflict() {
-            format!("{name}?")
+            format!("{name}??")
         } else {
             name.clone()
         };
@@ -415,7 +415,7 @@ fn extract_git_head(repo: &dyn Repo, commit: &Commit) -> String {
     let target = repo.view().git_head();
     if target.added_ids().contains(commit.id()) {
         if target.has_conflict() {
-            "HEAD@git?".to_string()
+            "HEAD@git??".to_string()
         } else {
             "HEAD@git".to_string()
         }