QBzr

  1. Bug #174509
  2. Comment #2

Comment 2 for bug 174509

Revision history for this message
Lukáš Lalinský (luks) wrote : Re: qcommit: Add a list of conflicts and an option to launch a merge tool to resolve them

I'll take a look on gconflicts, but I think I'd prefer it in qcommit. And if a separate command, then maybe part of qstatus.