summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorDylan Baker <dylan.c.baker@intel.com>2022-03-17 20:03:36 -0700
committerDylan Baker <dylan.c.baker@intel.com>2022-03-23 09:10:04 -0700
commit1178741fd0bb6ca6e4af047ba33ef754d8352b31 (patch)
tree36dcb97dd13aa7ee4f3d6b2f7026d4def62be455 /bin
parent93f5f9b75fd8d7f21c3d29a9f1a1ad1f7b6c006c (diff)
pick/ui: correctly handle MANUAL_RESOLUTION
Diffstat (limited to 'bin')
-rw-r--r--bin/pick/ui.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/pick/ui.py b/bin/pick/ui.py
index c13f32995ae..8eda8a0d1a5 100644
--- a/bin/pick/ui.py
+++ b/bin/pick/ui.py
@@ -171,7 +171,7 @@ class UI:
self.mainloop.widget = o
for commit in reversed(list(itertools.chain(self.new_commits, self.previous_commits))):
- if commit.nominated and commit.resolution is core.Resolution.UNRESOLVED:
+ if commit.nominated and commit.resolution in {core.Resolution.UNRESOLVED, core.Resolution.MANUAL_RESOLUTION}:
b = urwid.AttrMap(CommitWidget(self, commit), None, focus_map='reversed')
self.commit_list.append(b)
self.save()