From: Junio C Hamano <junkio@cox.net>
Date: Fri, 27 Oct 2006 23:07:02 +0000 (-0700)
Subject: t6022: ignoring untracked files by merge-recursive when they do not matter
X-Git-Tag: v1.4.4-rc1~4^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5b329a5f5e3625cdc204e3d274c89646816f384c?hp=5b329a5f5e3625cdc204e3d274c89646816f384c

t6022: ignoring untracked files by merge-recursive when they do not matter

Signed-off-by: Junio C Hamano <junkio@cox.net>
---