t3030: Add a testcase for resolvable rename/add conflict with symlinks
authorSchalk, Ken <ken.schalk@intel.com>
Mon, 20 Sep 2010 08:28:34 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:35 +0000 (17:32 -0700)
commit8a1c0d3...2e9b6963f3be6949475983d517d79796
treeea2458b...3a7bc6097742f6ae53c6b7b924b317c6copy hash to clipboard (tree)
parenta1155ad...2dde23fd664ad47399379cd0561762afcopy hash to clipboard (diff)
t/t3030-merge-recursive.sh