summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-25 10:48:24 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-25 10:48:24 -0700
commit530333cfe851b68a3635ee5bcfe707799dab9b83 (patch)
treead470776686540c3476510e21d48e82e7d4bb354 /git-merge-one-file.sh
parent4549162e8d623d69ea48745fce3709e5133ce043 (diff)
downloadgit-530333cfe851b68a3635ee5bcfe707799dab9b83.tar.gz
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>
Diffstat (limited to 'git-merge-one-file.sh')
-rwxr-xr-xgit-merge-one-file.sh2
1 files changed, 0 insertions, 2 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 0f164e54c1..57fad733ba 100755
--- a/git-merge-one-file.sh
+++ b/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=