Add support for opening resolve conflicts dialog

sirbabyface / TortoiseGit4Fman

Plugin to use Tortoise Git directly in fman (Windows only)

3 stars 0 forks source link

Open fkorsa opened 4 years ago

fkorsa commented 4 years ago

It's actually not yet possible, since tortoisegitproc does not have an option to open it - see issue https://gitlab.com/tortoisegit/tortoisegit/issues/3511.

Still, when the issue above is implemented, having the corresponding menu item in this plugin would be awesome.

Great plugin btw!

fkorsa commented 4 years ago

Actually, it's possible already. Apparently the command :resolve with a path argument that is a folder does open the resolve conflicts dialog.

sirbabyface commented 3 years ago

Added resolve command.