mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-12-03 06:53:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge my and Petr's git-merge-one-file-script modifications

Browse Source
This commit is contained in:
Linus Torvalds 2005-06-08 16:54:23 -07:00
commit 566487c8a6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-merge-one-file-script
View File

@ -23,7 +23,8 @@ case "${1:-.}${2:-.}${3:-.}" in
"$1..") "$1..")
echo "WARNING: $4 is removed in both branches." echo "WARNING: $4 is removed in both branches."
echo "WARNING: This is a potential rename conflict." echo "WARNING: This is a potential rename conflict."
exec git-update-cache --remove -- "$4" rm -f -- "$4" &&
exec git-update-cache --remove -- "$4"
;; ;;
# #