merge-recursive: When we detect we can skip an update, actually skip it
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:10 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:37 +0000 (14:19 -0700)
commit5b448b8...30308b1f5a7a721cb1bf0ba557b5c78d
treee895ab8...3412236b6cdb80c00dce09fd1cafd8d0copy hash to clipboard (tree)
parent3c217c0...7a86d9ae06ed26bb0baa4475d0e28a0ecopy hash to clipboard (diff)
merge-recursive.c
t/t6022-merge-rename.sh