search

mystor / git-revise

A handy tool for doing efficient in-memory commit rebases & fixups
MIT License
748 stars 31 forks source link

merge.conflict_prompt: Fix incorrect prompt label #97

Closed rwe closed 3 years ago

rwe commented 3 years ago

The labels tuple contains (current, base, other), and the prompt is choosing between current and other.

Previously, the prompt would erroneously use the base label for the other value.