merge-recursive: adjust to loosened "working file clobbered" check
authorJunio C Hamano <junkio@cox.net>
Fri, 27 Oct 2006 21:08:14 +0000 (14:08 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 28 Oct 2006 00:16:40 +0000 (17:16 -0700)
commit65ac6e9...3f47807cb603af07a6a9e1a43bc119ae
tree0f00787...3b6883e646563594fe4b45a8de297c07copy hash to clipboard (tree)
parent9fe0d87...a36ce4a61359a4d5c2ea2547e29b4d04copy hash to clipboard (diff)
merge-recursive.c