| commit | 1dcb3b6478cac3d301349c2df4af2e5ec69dfffe | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Thu, 10 May 2007 22:10:36 +0000 (10 18:10 -0400) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 10 May 2007 22:21:50 +0000 (10 15:21 -0700) | ||
| tree | fd82f08d165dde7482353fdc6ee2c322162ac9d7 | treesnapshot (tar.gz zip) |
| parent | 2b93bfac0f5bcabbf60f174f4e7bfa9e318e64d5 | commitdiff |
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>
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>
| builtin-revert.c | diffblobblamehistory |