diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-12-16 11:22:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-16 13:15:28 (GMT) |
| commit | 9abaa7f033283f84ba8372192f9d4a165fb09ce4 (patch) | |
| tree | 797be516bf362e1b478d2884fc0871c47d6e96d1 /git-resolve.sh | |
| parent | a2e88b35808a8c0334f169c9cbb2301764fb9e5a (diff) | |
| download | git-9abaa7f033283f84ba8372192f9d4a165fb09ce4.zip git-9abaa7f033283f84ba8372192f9d4a165fb09ce4.tar.gz git-9abaa7f033283f84ba8372192f9d4a165fb09ce4.tar.bz2 | |
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>
Diffstat (limited to 'git-resolve.sh')
0 files changed, 0 insertions, 0 deletions