Andrew's git / gitweb.git / commit
?
ll-merge: warn about inability to merge binary files only when we can't
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Sep 2012 09:01:52 +0000 (02:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Sep 2012 09:01:52 +0000 (02:01 -0700)
commite0e2065...74500119d5e12524992273de362acd30
tree4e28a9a...facca926c5fbbf3027417f0cf0a71aaacopy hash to clipboard (tree)
parent155a4b7...2efd3d917c228d155ec57ec2c09d7ac0copy hash to clipboard (diff)
ll-merge.c diff | blob | history