- Framework has been changed to primefaces.
- We have a free software under downloads.
LLE10252 : Howto configure git for merging with kdiff3
You would like a nicer merge tool with git and a GUI
Merging on the command line can be difficult. A nice GUI tool like kdiff 3 will help a lot. By default kdiff3 will also try to merge lines starting with --. These are deleted lines and can be ignored. You can change this in your KDiff3 configuration. To do this add ";--" to the "command line options to ignore".
To use kdiff3 only sometimes you can use the following.
git mergetool -t kdiff3
To configure it permanently you can use:
git config --global merge.tool kdiff3
The information provided in this document is intended for your information only. Lubby makes no claims to the validity of this information. Use of this information is at own risk!