Minnesota Supercomputing Institute
With regards to the safety measures put in place by the university to mitigate the risks of the COVID-19 virus, at this time all MSI systems will remain operational and can be accessed remotely as usual. The only planned outages concern our in-person Helpdesk and tutorials. More information, as well as alternative remote support options, can be found at MSI COVID-19 Continuity Plan
Wednesday, December 7, 2016
KDiff3 is a diff and merge program that compares or merges two or three text input files or directories, shows the differences line by line and character by character (!), provides an automatic merge-facility and an integrated editor for comfortable solving of merge-conflicts, supports Unicode, UTF-8 and other codecs, autodetection via byte-order-mark "BOM", supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.), printing of differences, manual alignment of lines, automatic merging of version control history ($Log$), and has an intuitive graphical user interface.
To run this software interactively in a Linux environment run the commands:
module load kdiff3