diff --git a/.gitmodules b/.gitmodules
index d7f28ed..3a40284 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,7 @@
 [submodule "3rd-party/editorconfig-vim"]
 	path = 3rd-party/editorconfig-vim
 	url = https://github.com/editorconfig/editorconfig-vim.git
+[submodule "3rd-party/icdiff"]
+	path = 3rd-party/icdiff
+	url = https://github.com/jeffkaufman/icdiff
+	branch = master
diff --git a/3rd-party/icdiff b/3rd-party/icdiff
new file mode 160000
index 0000000..7b3692c
--- /dev/null
+++ b/3rd-party/icdiff
@@ -0,0 +1 @@
+Subproject commit 7b3692c79555e981e3cdc6da1fdfabf5e7b0a4ea
diff --git a/files/bin/git-icdiff b/files/bin/git-icdiff
new file mode 120000
index 0000000..e2a14a0
--- /dev/null
+++ b/files/bin/git-icdiff
@@ -0,0 +1 @@
+../../3rd-party/icdiff/git-icdiff
\ No newline at end of file
diff --git a/files/bin/icdiff b/files/bin/icdiff
new file mode 120000
index 0000000..715707e
--- /dev/null
+++ b/files/bin/icdiff
@@ -0,0 +1 @@
+../../3rd-party/icdiff/icdiff
\ No newline at end of file