Remove git test-merge

This is replaced more featurefully by the native Git binary `git merge-tree` instead. Signed-off-by: brian m. carlson <[email protected]>
bk2204 · Oct 23, 2023 · 543925c · 543925c
1 parent 91442b4
commit 543925c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 237 deletions.
diff --git a/README.adoc b/README.adoc
@@ -13,9 +13,6 @@ git at::
 git recent-refs::
   `git recent-refs` lists the most recent references and commits that you've used.
   It can sort by the committer date (`--sort=committerdate`), author date (`--sort=authordate`), or the date that the commit was last checked out (`--sort=visitdate`).
-git test-merge::
-  `git test-merge` takes two branches or other revisions and tries to perform a merge and exits successfully or unsuccessfully depending on whether it succeeded.
-  If you pass `--write-tree` it writes the result of the merge into the repository and prints the tree to the output.
 
 == Included Git LFS-Specific Utilities
 
@@ -27,6 +24,10 @@ git-lfs-transfer::
   This utility is intended to be invoked over SSH to transfer data from one repository to another.
   https://github.com/git-lfs/git-lfs/blob/main/docs/proposals/ssh_adapter.md[The Git LFS documentation outlines the protocol.]
 
+== Former Binaries
+
+This package used to include `git test-merge`, but no longer does, because Git includes `git merge-tree` instead.
+
 == Building
 
 You will need Rust 1.63 or later, Cargo, GNU Make, and Git.

diff --git a/scutiger-bin/src/bin/git-test-merge.rs b/scutiger-bin/src/bin/git-test-merge.rs