Merge branch 'pd/mergetool-nvimdiff'

gitster · gitster · commit d203add8925f · 2020-11-21T15:14:39.000-08:00
Fix regression introduced when nvimdiff support in mergetool was added.

* pd/mergetool-nvimdiff:
  mergetool: avoid letting `list_tool_variants` break user-defined setups
  mergetools/bc: add `bc4` to the alias list for Beyond Compare
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
@@ -138,6 +138,10 @@ setup_user_tool () {
 	merge_cmd () {
 		( eval $merge_tool_cmd )
 	}
+
+	list_tool_variants () {
+		echo "$tool"
+	}
 }
 
 setup_tool () {
diff --git a/mergetools/bc b/mergetools/bc
@@ -25,4 +25,5 @@ translate_merge_tool_path() {
 list_tool_variants () {
 	echo bc
 	echo bc3
+	echo bc4
 }

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,10 @@ setup_user_tool () {`
`138`	`138`	`merge_cmd () {`
`139`	`139`	`( eval $merge_tool_cmd )`
`140`	`140`	`}`
	`141`	`+`
	`142`	`+ list_tool_variants () {`
	`143`	`+ echo "$tool"`
	`144`	`+ }`
`141`	`145`	`}`
`142`	`146`
`143`	`147`	`setup_tool () {`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,5 @@ translate_merge_tool_path() {`
`25`	`25`	`list_tool_variants () {`
`26`	`26`	`echo bc`
`27`	`27`	`echo bc3`
	`28`	`+ echo bc4`
`28`	`29`	`}`