merge-file: run setup_git_directory_gently() sooner
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Fri, 6 Aug 2010 03:27:43 +0000 (22:27 -0500)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Aug 2010 03:00:03 +0000 (20:00 -0700)
commit3668d42...8314dc5db98de3034058f68ff57a6b1e
treea7d5c54...4e53eeeb7a2c8fc4a93dbd181cbcef59copy hash to clipboard (tree)
parent2bc8c1a...a6b1cdffc19badc7272f552302b79d3ecopy hash to clipboard (diff)
builtin/merge-file.c
git.c