diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-05-10 22:10:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-10 22:21:50 (GMT) |
| commit | 1dcb3b6478cac3d301349c2df4af2e5ec69dfffe (patch) | |
| tree | fd82f08d165dde7482353fdc6ee2c322162ac9d7 /archive-zip.c | |
| parent | 2b93bfac0f5bcabbf60f174f4e7bfa9e318e64d5 (diff) | |
| download | git-1dcb3b6478cac3d301349c2df4af2e5ec69dfffe.zip git-1dcb3b6478cac3d301349c2df4af2e5ec69dfffe.tar.gz git-1dcb3b6478cac3d301349c2df4af2e5ec69dfffe.tar.bz2 | |
Correct error message in revert/cherry-pick
We now write to MERGE_MSG, not .msg. I missed this earlier
when I changed the target we write to.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'archive-zip.c')
0 files changed, 0 insertions, 0 deletions