Andrew's git / gitweb.git / diff
?
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)
Signed-off-by: Dan Hensgen <dan@methodhead.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found