Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Launch Diff Tool does not work for resolving merge conflicts under Xfce #524
I'm using linux mint 17.2 with the Xfce desktop and git-cola 2.4. I've configured kdiff3 as my diff tool and merge tool.
In a 'merge with conflicts' scenario, selecting 'Launch Diff Tool' on a staged file with no-conflicts will successfully launch kdiff3. However, selecting 'Launch Diff Tool' on an unmerged file with conflicts fails to launch kdiff3. The error in the git-cola terminal is:
#354 raised the issue that git-cola has an undocumented dependency on xterm, which commit 6b55a71 was supposed to fix but it looks like xfce4-terminal is unable to parse the command used to launch kdiff3 in 3-way merge mode when xterm is not available.
I was able to get it to work with xterm once I installed xterm and explicitly set cola.terminal to use it.
fails with the error reported above, however:
does work correctly and launches kdiff3 as expected.
This same issue also made it so that gnome-terminal is usable.
konsole and xterm, from an outsider's perspective, have the most sane handling for the
We now special-case these so at least it works. Thanks for the help.