mirror of
https://github.com/git/git.git
synced 2024-10-31 06:17:56 +01:00
2cf565c53c
Split the core-git.txt file Formatting fix to the diff-format.txt Signed-off-by: David Greaves <david@dgreaves.com>
30 lines
463 B
Text
30 lines
463 B
Text
git-resolve-script(1)
|
|
=====================
|
|
v0.1, May 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>
|
|
|
|
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
|
|
|