Andrew's git / gitweb.git / commit
?
git-merge documentation: describe how conflict is presented
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Sep 2008 03:36:32 +0000 (20:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Sep 2008 03:36:32 +0000 (20:36 -0700)
commit70a3f89...33a4cd21631690ba980598fea2249067
treeed31638...e68e4d5ea33af03fe5977606d03151a7copy hash to clipboard (tree)
parenteac5a40...512181cd315a1031af2b8a25430e335acopy hash to clipboard (diff)
Documentation/git-merge.txt diff | blob | history