Issue #2236 resolved

add doubleclick actions in resolve window

Ike Casteleyn
created an issue

On the unresolved files a double click would initiate "tool resolve" or "internal:merge". It depends on whether "auto resolve" was checked before the merge was applied. If yes, then "tool resolve" If no, then "internal:merge"

On the resolved files a double click would initiate "diff to local".

See initial discussion here https://groups.google.com/forum/?hl=en&fromgroups=#!topic/thg-dev/A5JO9Fc2fpk

Comments (1)

  1. Yuya Nishihara

    resolve: add doubleclick actions in resolve window (fixes #2236)

    Resolved files tree: double click an item performs a "Diff to Local" Unresolved files tree: double click an item performs - "Mercurial Resolve" when "Auto-resolve merges" is not checked in settings - "Tool Resolve" when "Auto-resolve merges" is checked in settings

    → <<cset dd58407a6018>>

  2. Log in to comment