diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-09-09 01:15:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-10 18:30:42 -0700 |
| commit | 0f69be537618036c45bc07919248b88afbf7af3e (patch) | |
| tree | b9d98fbff2a5b6ec4b17656eea6321b251b9a0b9 /convert-objects.c | |
| parent | Use Daniel's read-tree in the merge strategy 'resolve'. (diff) | |
| download | tgif-0f69be537618036c45bc07919248b88afbf7af3e.tar.xz | |
'git-merge': Documentation.
... and add link from git.txt, as usual.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'convert-objects.c')
0 files changed, 0 insertions, 0 deletions