![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Sat, 16 Dec 2006 11:22:18 +0000 (12:22 +0100) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 16 Dec 2006 13:15:28 +0000 (05:15 -0800) | ||
| commit | 9abaa7f033283f84ba8372192f9d4a165fb09ce4 | |
| tree | 797be516bf362e1b478d2884fc0871c47d6e96d1 | tree | snapshot |
| parent | a2e88b35808a8c0334f169c9cbb2301764fb9e5a | commit | 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>
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 | history |