Visualize File Differences With Icdiff

Introduction

icdiff is a command-line utility that enhances the traditional diff command by showing differences between files in a side-by-side comparison with color coding. This makes it easier to understand changes and spot differences. In this tutorial, you'll learn how to install icdiff, use it to compare files, and explore its various options for better output customization.

Skills Graph

Begin To Compare

To compare two files using icdiff, simply pass the file names as arguments to the icdiff command.

There are two files file1.txt and file2.txt in ~/project, open the terminal ( ① or ② in the figure ) in the environment and enter the following command:

icdiff file1.txt file2.txt

This shows the differences between file1.txt and file2.txt side by side, with deletions highlighted in red, additions in green and conflicts in yellow.

Advanced Options

icdiff offers several options to customize the output according to your needs.

Showing Line Numbers

To include line numbers in the output, use the --line-numbers option.

icdiff --line-numbers file1.txt file2.txt

Recursive Comparison

For comparing directories recursively, use the --recursive option.

icdiff --recursive dir1 dir2

Integration With Git

icdiff can be integrated with Git to enhance git diff output. Set up icdiff as a Git difftool by configuring your .gitconfig:

[diff]
    tool = icdiff
[difftool "icdiff"]
    cmd = icdiff --line-numbers \"$LOCAL\" \"$REMOTE\"

Summary

icdiff is a powerful tool for visualizing differences between files in a clear, color-coded format. By following this tutorial, you should now be able to install icdiff, compare files, and customize the output to suit your needs. Experiment with the various options to become more proficient in identifying and understanding changes in your files.