Squashed 'third_party/git/' content from commit cb71568594

git-subtree-dir: third_party/git git-subtree-split: cb715685942260375e1eb8153b0768a376e4ece7
2020-01-11 23:36:56 +00:00 · 2020-01-11 23:36:56 +00:00 · 1b593e1ea4
commit 1b593e1ea4
3629 changed files with 1139935 additions and 0 deletions
--- a/mergetools/diffmerge
+++ b/mergetools/diffmerge
@ -0,0 +1,18 @@
+diff_cmd () {
+	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
+}
+
+merge_cmd () {
+	if $base_present
+	then
+		"$merge_tool_path" --merge --result="$MERGED" \
+			"$LOCAL" "$BASE" "$REMOTE"
+	else
+		"$merge_tool_path" --merge \
+			--result="$MERGED" "$LOCAL" "$REMOTE"
+	fi
+}
+
+exit_code_trustable () {
+	true
+}