about summary refs log tree commit diff
path: root/third_party/git/mergetools/vimdiff2
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2020-11-21T18·20+0100
committerVincent Ambo <mail@tazj.in>2020-11-21T18·45+0100
commitf4609b896fac842433bd495c166d5987852a6a73 (patch)
tree95511c465c54c4f5d27e5d39ce187e2a1dd82bd3 /third_party/git/mergetools/vimdiff2
parent082c006c04343a78d87b6c6ab3608c25d6213c3f (diff)
merge(3p/git): Merge git subtree at v2.29.2 r/1890
This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because
there is some breakage in the git build related to the netrc
credentials helper which someone has taken care of in nixpkgs.

The stable channel is not used for anything other than git, so this
should be fine.

Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb
Diffstat (limited to 'third_party/git/mergetools/vimdiff2')
-rw-r--r--third_party/git/mergetools/vimdiff21
1 files changed, 0 insertions, 1 deletions
diff --git a/third_party/git/mergetools/vimdiff2 b/third_party/git/mergetools/vimdiff2
deleted file mode 100644
index 04a5bb0ea848..000000000000
--- a/third_party/git/mergetools/vimdiff2
+++ /dev/null
@@ -1 +0,0 @@
-. "$MERGE_TOOLS_DIR/vimdiff"