aboutsummaryrefslogtreecommitdiff
path: root/repos/core/git/.files
diff options
context:
space:
mode:
authoremmett1 <emmett1.2miligrams@protonmail.com>2024-10-21 23:42:50 +0800
committeremmett1 <emmett1.2miligrams@protonmail.com>2024-10-21 23:42:50 +0800
commitc7adfd82db7270efefbc31e20fe06787de471169 (patch)
treef7b487e279aea11ab81151ee7abd5e2c2771c1e6 /repos/core/git/.files
parent60c7ddac9d61ad4a45a8c256289d41a895d58f32 (diff)
downloadalicelinux-c7adfd82db7270efefbc31e20fe06787de471169.tar.gz
alicelinux-c7adfd82db7270efefbc31e20fe06787de471169.zip
git: updated to 2.47.0
Diffstat (limited to 'repos/core/git/.files')
-rw-r--r--repos/core/git/.files1
1 files changed, 1 insertions, 0 deletions
diff --git a/repos/core/git/.files b/repos/core/git/.files
index a9e3498d..495c50d8 100644
--- a/repos/core/git/.files
+++ b/repos/core/git/.files
@@ -201,6 +201,7 @@ drwxr-xr-x root/root usr/libexec/git-core/mergetools/
-rw-r--r-- root/root usr/libexec/git-core/mergetools/tkdiff
-rw-r--r-- root/root usr/libexec/git-core/mergetools/tortoisemerge
-rw-r--r-- root/root usr/libexec/git-core/mergetools/vimdiff
+-rw-r--r-- root/root usr/libexec/git-core/mergetools/vscode
-rw-r--r-- root/root usr/libexec/git-core/mergetools/winmerge
-rw-r--r-- root/root usr/libexec/git-core/mergetools/xxdiff
-rwxr-xr-x root/root usr/libexec/git-core/scalar