checkout,merge: loosen overwriting untracked file check based on info/exclude
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Sun, 27 Nov 2011 10:15:32 +0000 (17:15 +0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Nov 2011 18:37:50 +0000 (10:37 -0800)
commitfc001b5...6c42e5fb776340136a2fb247e391a61b
tree8f88d4c...de012085a03384b1f5a952c8de8541ebcopy hash to clipboard (tree)
parent87b5054...a08ac6caa083ddc376e674424e37940acopy hash to clipboard (diff)
builtin/checkout.c
builtin/merge.c