projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9188ed8) | patch
git-merge documentation: more details about resolving conflicts
authorDan Hensgen <dan@macbook.danhensgen.com>
Fri, 22 Aug 2008 03:32:00 +0000 (23:32 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 Aug 2008 00:32:54 +0000 (17:32 -0700)
commit34ad1afa712da208f29d8300b73a6753516564fb
tree2f8b0bed6cc9a81e5987c3e43c02bb955d8c00d6tree | snapshot
parent9188ed8962ed47c0f41c24eb1317aa07037da545commit | diff
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>
Documentation/git-merge.txt diff | blob | history
Git—the stupid content tracker