git-merge: do up-to-date check also for all strategies
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Aug 2007 06:19:55 +0000 (23:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Aug 2007 06:48:28 +0000 (23:48 -0700)
commita005085...40ef77ac0dde8eb08e27c6ef868d4bab
tree6f1a05e...146ed26c6229b972cf13e1d9230e37eccopy hash to clipboard (tree)
parent9277d60...33a1829742aa2d9d20ddbfc3b2b7acdecopy hash to clipboard (diff)
git-merge.sh
t/t6028-merge-up-to-date.sh [new file with mode: 0755]