Skip to content

Commit

Permalink
merge-one-file: remove stale comment
Browse files Browse the repository at this point in the history
The "funny filename" comment was from b539c5e (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>
  • Loading branch information
Junio C Hamano committed Mar 25, 2013
1 parent 4549162 commit 530333c
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions git-merge-one-file.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down

0 comments on commit 530333c

Please sign in to comment.