Public bug reported:
See http://article.gmane.org/gmane.comp.version-control.git/112568 and
http://kdiff3.svn.sourceforge.net/viewvc/kdiff3/trunk/kdiff3/src-
QT4/fileaccess.cpp?r1=84&r2=96 . This makes git mergetool with kdiff3
not function correctly. It has been fixed in KDIff3 0.9.95. Please
update the package. : )
** Affects: ubuntu
Importance: Undecided
Status: New
--
kdiff3 chokes on files with executable permissions, breaking git mergetool
https://bugs.launchpad.net/bugs/372454
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
