diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-25 10:48:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-25 10:48:24 -0700 |
| commit | 530333cfe851b68a3635ee5bcfe707799dab9b83 (patch) | |
| tree | ad470776686540c3476510e21d48e82e7d4bb354 /prompt.h | |
| parent | mergetools/p4merge: create a base if none available (diff) | |
| download | tgif-530333cfe851b68a3635ee5bcfe707799dab9b83.tar.xz | |
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 'prompt.h')
0 files changed, 0 insertions, 0 deletions