diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-06-28 02:11:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-28 03:20:51 -0700 |
| commit | 66eb64cba64a26dbf2b1d4e319d6514696154fee (patch) | |
| tree | d38739ca87e2a0bc12e1c2ff09aaf83b6762079c /daemon.c | |
| parent | 33ebb8717f15a85615f712df125c37737062e1b2 (diff) | |
| download | git-66eb64cba64a26dbf2b1d4e319d6514696154fee.tar.gz git-66eb64cba64a26dbf2b1d4e319d6514696154fee.tar.xz | |
rebase: get rid of outdated MRESOLVEMSG
There was a time when rebase --skip didn't work when used with
--merge, but that is no more so we don't need that message
anymore.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'daemon.c')
0 files changed, 0 insertions, 0 deletions