Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove last remnants of git-test-merge #16

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Remove last remnants of git-test-merge #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions doc/man/git-test-merge.adoc
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions scutiger-bin/README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,3 @@ refs/heads/master
refs/heads/azure-pipelines
refs/heads/master
----

=== 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.

For example, an invocation might look like this:

[source,shell]
----
$ git test-merge --write-tree merge1 merge3
ff2a880a0f65b9291dae1958f772a7b819e023c9
$ git test-merge merge1 merge2
fatal: merge conflict
----