merge-recursive: Fix sorting order and directory change assumptions
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:56 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:34 +0000 (14:19 -0700)
commitf0fd4d0...e8a17fe5ccdd4d3edd686bc6702b8144
treea0f6aa6...0a85b460c96cd8d6984c1bb857bc3703copy hash to clipboard (tree)
parent7b1c610...84a46fa237627b3307707afb520e555ccopy hash to clipboard (diff)
merge-recursive.c
t/t6020-merge-df.sh