summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorDan Hensgen <dan@macbook.danhensgen.com>2008-08-22 03:32:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-23 00:32:54 (GMT)
commit34ad1afa712da208f29d8300b73a6753516564fb (patch)
tree2f8b0bed6cc9a81e5987c3e43c02bb955d8c00d6 /read-cache.c
parent9188ed8962ed47c0f41c24eb1317aa07037da545 (diff)
downloadgit-34ad1afa712da208f29d8300b73a6753516564fb.zip
git-34ad1afa712da208f29d8300b73a6753516564fb.tar.gz
git-34ad1afa712da208f29d8300b73a6753516564fb.tar.bz2
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 'read-cache.c')
0 files changed, 0 insertions, 0 deletions