Documentation / git-merge-tree.txton commit parseopt: add OPT_NOOP_NOARG (6acec03)
   1git-merge-tree(1)
   2=================
   3
   4NAME
   5----
   6git-merge-tree - Show three-way merge without touching index
   7
   8
   9SYNOPSIS
  10--------
  11[verse]
  12'git merge-tree' <base-tree> <branch1> <branch2>
  13
  14DESCRIPTION
  15-----------
  16Reads three treeish, and output trivial merge results and
  17conflicting stages to the standard output.  This is similar to
  18what three-way 'git read-tree -m' does, but instead of storing the
  19results in the index, the command outputs the entries to the
  20standard output.
  21
  22This is meant to be used by higher level scripts to compute
  23merge results outside of the index, and stuff the results back into the
  24index.  For this reason, the output from the command omits
  25entries that match the <branch1> tree.
  26
  27GIT
  28---
  29Part of the linkgit:git[1] suite