| commit | 530333cfe851b68a3635ee5bcfe707799dab9b83 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Mar 2013 17:48:24 +0000 (25 10:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Mar 2013 17:48:24 +0000 (25 10:48 -0700) | ||
| tree | ad470776686540c3476510e21d48e82e7d4bb354 | treesnapshot (tar.gz zip) |
| parent | 4549162e8d623d69ea48745fce3709e5133ce043 | commitdiff |
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>
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>
| git-merge-one-file.sh | diffblobblamehistory |