From 365cd0087b434e68061594bdc62b21527b232143 Mon Sep 17 00:00:00 2001 From: piernov Date: Thu, 26 Apr 2012 03:42:13 +0000 Subject: git 1.7.10-1 màj port (cherry picked from commit ec1b754278e5e5c438ced13c588b9b6c0c3a4c24) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- git/.footprint.i686 | 1 + 1 file changed, 1 insertion(+) (limited to 'git/.footprint.i686') diff --git a/git/.footprint.i686 b/git/.footprint.i686 index 5ddea17df..a05253ea5 100644 --- a/git/.footprint.i686 +++ b/git/.footprint.i686 @@ -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 -- cgit v1.2.3-54-g00ecf