64048d670b
Before: You are in the middle of a conflicted merge. After: Merge is not possible because you have unmerged files. I prefer the old message, but the new one is more consistent with other commands and tests expect it. In particular, without this change the scripted merge does not pass t3030. Based on v1.7.0-rc0~66^2 (Be more user-friendly when refusing to do something because of conflict., 2010-01-12). Cc: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> |
||
---|---|---|
.. | ||
builtin-fetch--tool.c | ||
git-checkout.sh | ||
git-clean.sh | ||
git-clone.sh | ||
git-commit.sh | ||
git-fetch.sh | ||
git-gc.sh | ||
git-ls-remote.sh | ||
git-merge-ours.sh | ||
git-merge.sh | ||
git-notes.sh | ||
git-remote.perl | ||
git-rerere.perl | ||
git-reset.sh | ||
git-resolve.sh | ||
git-revert.sh | ||
git-svnimport.perl | ||
git-svnimport.txt | ||
git-tag.sh | ||
git-verify-tag.sh | ||
README |
These are original scripted implementations, kept primarily for their reference value to any aspiring plumbing users who want to learn how pieces can be fit together.