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

1 files changed, 0 insertions, 23 deletions

diff --git a/third_party/git/t/t6045-merge-rename-delete.sh b/third_party/git/t/t6045-merge-rename-delete.sh
deleted file mode 100755
index 5d33577d2f79..000000000000
--- a/third_party/git/t/t6045-merge-rename-delete.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-test_description='Merge-recursive rename/delete conflict message'
-. ./test-lib.sh
-
-test_expect_success 'rename/delete' '
-	echo foo >A &&
-	git add A &&
-	git commit -m "initial" &&
-
-	git checkout -b rename &&
-	git mv A B &&
-	git commit -m "rename" &&
-
-	git checkout master &&
-	git rm A &&
-	git commit -m "delete" &&
-
-	test_must_fail git merge --strategy=recursive rename >output &&
-	test_i18ngrep "CONFLICT (rename/delete): A deleted in HEAD and renamed to B in rename. Version rename of B left in tree." output
-'
-
-test_done