summaryrefslogtreecommitdiffstats
path: root/git/.footprint.x86_64
diff options
context:
space:
mode:
Diffstat (limited to 'git/.footprint.x86_64')
-rw-r--r--git/.footprint.x86_641
1 files changed, 1 insertions, 0 deletions
diff --git a/git/.footprint.x86_64 b/git/.footprint.x86_64
index 5ddea17df..a05253ea5 100644
--- a/git/.footprint.x86_64
+++ b/git/.footprint.x86_64
@@ -174,6 +174,7 @@ drwxr-xr-x root/root usr/lib/git-core/mergetools/
-rw-r--r-- root/root usr/lib/git-core/mergetools/araxis
-rw-r--r-- root/root usr/lib/git-core/mergetools/bc3
-rw-r--r-- root/root usr/lib/git-core/mergetools/defaults
+-rw-r--r-- root/root usr/lib/git-core/mergetools/deltawalker
-rw-r--r-- root/root usr/lib/git-core/mergetools/diffuse
-rw-r--r-- root/root usr/lib/git-core/mergetools/ecmerge
-rw-r--r-- root/root usr/lib/git-core/mergetools/emerge