summaryrefslogtreecommitdiff
path: root/Documentation/git-resolve-script.txt
blob: 99c399a073cd9cd69783312a6930f3fb2cca55f0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
git-resolve-script(1)
=====================
v0.99.4, Aug 2005

NAME
----
git-resolve-script - Script used to merge two trees


SYNOPSIS
--------
'git-resolve-script'

DESCRIPTION
-----------
This script is used by Linus to merge two trees.


Author
------
Written by Linus Torvalds <torvalds@osdl.org> and
Dan Holmsand <holmsand@gmail.com>.

Documentation
--------------
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.

GIT
---
Part of the link:git.html[git] suite