oneway_merge(): only lstat() when told to update worktree
authorMartin von Zweigbergk <martinvonz@gmail.com>
Thu, 20 Dec 2012 21:03:36 +0000 (13:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Dec 2012 21:07:22 +0000 (13:07 -0800)
commit686b2de...ceb2c5a1fb6c8822a8aceb8a05e2fc76
treeb621f7c...d0814d6658c86fa54a0773104e5ec9f3copy hash to clipboard (tree)
parent7e20105...7e96d0a1144520222f20ba1dc3d61441copy hash to clipboard (diff)
unpack-trees.c