mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
![]() Check MERGE_HEAD and bail out if it exists. Based on v1.6.3.3~3^2 (refuse to merge during a merge, 2009-06-01). Without this change, the scripted merge does not pass t3030. Cc: Clemens Buchacher <drizzd@aon.at> 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.