You can launch e.g. kdiff3 when necessary to resolve conflicts visually without using a GUI git clint.
You can launch e.g. kdiff3 when necessary to resolve conflicts visually without using a GUI git clint.