]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/git-merge-file.txt
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a2e88b3) | patch
Document git-merge-file
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Sat, 16 Dec 2006 11:22:18 +0000 (12:22 +0100)
committerJunio C Hamano <junkio@cox.net>
Sat, 16 Dec 2006 13:15:28 +0000 (05:15 -0800)
commit9abaa7f033283f84ba8372192f9d4a165fb09ce4
tree797be516bf362e1b478d2884fc0871c47d6e96d1tree | snapshot
parenta2e88b35808a8c0334f169c9cbb2301764fb9e5acommit | diff
Document git-merge-file

Most of this is derived from the documentation of RCS merge.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-merge-file.txt [new file with mode: 0644] blob
Documentation/git.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.