Documentation/git-resolve-script.txt

   1 git-resolve-script(1)
   2 =====================
   3 v0.99.4, Aug 2005
   4
   5 NAME
   6 ----
   7 git-resolve-script - Script used to merge two trees
   8
   9
  10 SYNOPSIS
  11 --------
  12 'git-resolve-script'
  13
  14 DESCRIPTION
  15 -----------
  16 This script is used by Linus to merge two trees.
  17
  18
  19 Author
  20 ------
  21 Written by Linus Torvalds <torvalds@osdl.org> and
  22 Dan Holmsand <holmsand@gmail.com>.
  23
  24 Documentation
  25 --------------
  26 Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
  27
  28 GIT
  29 ---
  30 Part of the link:git.html[git] suite
  31