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