qconflicts: unable to use WinMerge tool to resolve conflicts
Bug #485566 reported by
Alexander Belchenko
This bug report is a duplicate of:
Bug #489915: [master] external diff/merge configuration needs serious rework.
Edit
Remove
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
QBzr |
Confirmed
|
High
|
Unassigned |
Bug Description
to run WinMerge GUI tool for text conflict I need to specify following command line template:
C:/Program Files/WinMerge/
because WinMerge just parse conflict markers and don't use THIS/OTHER and BASE files.
Unfortunately qconflicts dialog does not allow me this, insist that I should have other %xxx options in command-line. This is wrong.
Changed in qbzr: | |
status: | New → Confirmed |
importance: | Undecided → High |
tags: | added: qconflicts |
To post a comment you must log in.
This bug marked as duplicate of meta-bug #489915, because there is needs to seriously improve our internal model.
If you disagree with duplicate status or want fix this problem separately, feel free to clear duplicate flag.