apply: check D/F conflicts more carefully.
authorJunio C Hamano <junkio@cox.net>
Mon, 17 Jul 2006 06:28:23 +0000 (23:28 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 17 Jul 2006 06:28:36 +0000 (23:28 -0700)
commitc28c571...143a5145665f4bf334671ac3a7d0980c
tree713d684...dc39cc577b222449a1b340cfd2c5bec4copy hash to clipboard (tree)
parent8641fb2...ee3ab86bac62f88d31f6e92a9323f699copy hash to clipboard (diff)
builtin-apply.c