[PATCH] Better error message from checkout-cache for unmerged files.
authorJunio C Hamano <junkio@cox.net>
Sun, 17 Apr 2005 17:02:21 +0000 (10:02 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 17 Apr 2005 17:02:21 +0000 (10:02 -0700)
commita38800f...e24a44b12a9ed14852339466de1cb9c9
tree3698891...68fda449e3ba7fe859a5b65d54e60c79copy hash to clipboard (tree)
parentfa06d44...c6c5113fcff9991f349157bdb0c4b989copy hash to clipboard (diff)
checkout-cache.c