merge: loosen overcautious "working file will be lost" check.
authorJunio C Hamano <junkio@cox.net>
Mon, 9 Oct 2006 05:48:06 +0000 (22:48 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 28 Oct 2006 00:16:39 +0000 (17:16 -0700)
commited93b44...c5e13a70beb7f0ae02fb6da95e42a805
tree717a934...89e5f29199b460ab720e0e227ee4aac3copy hash to clipboard (tree)
parent887a612...ef942dd3e7dae452e2dc582738b0fb41copy hash to clipboard (diff)
git-merge-one-file.sh
t/t1004-read-tree-m-u-wf.sh [new file with mode: 0755]
unpack-trees.c