about summary refs log tree commit diff
path: root/third_party/git/mergetools/examdiff
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-09-21T10·03+0300
committerVincent Ambo <mail@tazj.in>2021-09-21T11·29+0300
commit43b1791ec601732ac31195df96781a848360a9ac (patch)
treedaae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/mergetools/examdiff
parent2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff)
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping
it in sync with cgit would be easier this way, but it has proven not
to be a big issue.

On the other hand, a vendored copy of git is an annoying maintenance
burden. It is much easier to rebase the single (dottime) patch that we
have.

This removes the vendored copy of git and instead passes the git
source code to cgit via `pkgs.srcOnly`, which includes the applied
patch so that cgit can continue rendering dottime.

Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/mergetools/examdiff')
-rw-r--r--third_party/git/mergetools/examdiff16
1 files changed, 0 insertions, 16 deletions
diff --git a/third_party/git/mergetools/examdiff b/third_party/git/mergetools/examdiff
deleted file mode 100644
index e72b06fc4d8f..000000000000
--- a/third_party/git/mergetools/examdiff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" "$LOCAL" "$REMOTE" -nh
-}
-
-merge_cmd () {
-	if $base_present
-	then
-		"$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh
-	else
-		"$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh
-	fi
-}
-
-translate_merge_tool_path() {
-	mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
-}