H0llyW00dzZ/git
H0llyW00dzZ/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-04-18 03:35:48 +00:00
Code Releases Activity

merge-one-file: remove stale comment

Browse Source 
The "funny filename" comment was from b539c5e8fbd3 (git-merge-one:
new merge world order., 2005-12-07) where the removed code just
before that new comment ended with:

        merge "$4" "$orig" "$src2"

(yes, we used to use "merge" program from the RCS suite).  The
comment refers to one of the bad side effect the old code used to
have and warns against such a practice, i.e. it was talking about
the code that no longer existed.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2013-03-25 10:48:24 -07:00
parent 4549162e8d
commit 530333cfe8
1 changed files with 0 additions and 2 deletions

2
git-merge-one-file.sh

@ -118,8 +118,6 @@ case "${1:-.}${2:-.}${3:-.}" in
;;
esac
# Be careful for funny filename such as "-L" in "$4", which
# would confuse "merge" greatly.
git merge-file "$src1" "$orig" "$src2"
ret=$?
msg=