merge-one-file: remove stale comment
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>
Junio C Hamano committed
Mar 25, 2013 at 10:48 UTC
530333cfe851b68a3635ee5bcfe707799dab9b83
1 file changed
-2
git-merge-one-file.sh
-2
@@ -118,8 +118,6 @@ case "${1:-.}${2:-.}${3:-.}" in
118
;;
119
esac
120
121
- # Be careful for funny filename such as "-L" in "$4", which
122
- # would confuse "merge" greatly.
121
git merge-file "$src1" "$orig" "$src2"
122
ret=$?
123
msg=