aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2011-08-11 23:20:24 -0600
committerJunio C Hamano <gitster@pobox.com>2011-08-14 14:19:39 -0700
commit3f680ff0cf41c80b5c3a7ef4e7b417c0aa788dfb (patch)
treea3a8f78659a53f913fc532f7c6287236efb90985 /merge-recursive.c
parent814f7d902b6bcbb67ff8efa5e75eceb7b5fcc0d8 (diff)
downloadgit-3f680ff0cf41c80b5c3a7ef4e7b417c0aa788dfb.tar.gz
git-3f680ff0cf41c80b5c3a7ef4e7b417c0aa788dfb.tar.xz
t6022: Add testcase for spurious "refusing to lose untracked" messages
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions