summaryrefslogtreecommitdiff
path: root/builtin-fmt-merge-msg.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-07-16 23:25:12 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-07-16 23:25:12 -0700
commitf8f0b1f0e7e96bf996c657d2c5c15e0ba3a4eeac (patch)
treedae37badcba43ea7116fbe9c5dd5512a4696ff76 /builtin-fmt-merge-msg.c
parentgit-svn: don't check for migrations/upgrades on commit-diff (diff)
downloadtgif-f8f0b1f0e7e96bf996c657d2c5c15e0ba3a4eeac.tar.xz
checkout -f failed to check out a file if an existing directory interfered.
When path foo/bar existed in the working tree, checkout -f to switch to a branch that has a file foo silently did a wrong thing. It failed to remove the directory foo, did not check out the file foo, and the worst of all it did not report any errors. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions