diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-17 14:34:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-17 14:34:00 -0700 |
| commit | e6f28d0b6c239f15760194c8b12afdaa1a7bdd34 (patch) | |
| tree | b782d1e78feb1a9f17131581d754b0e29abaa0b8 /git-merge-tree.txt | |
| parent | 0e0e0d2656a57fd3628bb6dbdaf0096684ed24a9 (diff) | |
| download | git-htmldocs-e6f28d0b6c239f15760194c8b12afdaa1a7bdd34.tar.gz | |
Autogenerated HTML docs for v1.8.4-357-g8d83
Diffstat (limited to 'git-merge-tree.txt')
| -rw-r--r-- | git-merge-tree.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-tree.txt b/git-merge-tree.txt index c5f84b649..58731c194 100644 --- a/git-merge-tree.txt +++ b/git-merge-tree.txt @@ -13,7 +13,7 @@ SYNOPSIS DESCRIPTION ----------- -Reads three treeish, and output trivial merge results and +Reads three tree-ish, and output trivial merge results and conflicting stages to the standard output. This is similar to what three-way 'git read-tree -m' does, but instead of storing the results in the index, the command outputs the entries to the |