diff options
| author | Dan Hensgen <dan@macbook.danhensgen.com> | 2008-08-21 23:32:00 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-22 17:32:54 -0700 |
| commit | 34ad1afa712da208f29d8300b73a6753516564fb (patch) | |
| tree | 2f8b0bed6cc9a81e5987c3e43c02bb955d8c00d6 /git-submodule.sh | |
| parent | 9188ed8962ed47c0f41c24eb1317aa07037da545 (diff) | |
| download | git-34ad1afa712da208f29d8300b73a6753516564fb.tar.gz | |
git-merge documentation: more details about resolving conflicts
Signed-off-by: Dan Hensgen <dan@methodhead.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-submodule.sh')
0 files changed, 0 insertions, 0 deletions