aboutsummaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-05-10 18:10:36 -0400
committerJunio C Hamano <junkio@cox.net>2007-05-10 15:21:50 -0700
commit1dcb3b6478cac3d301349c2df4af2e5ec69dfffe (patch)
treefd82f08d165dde7482353fdc6ee2c322162ac9d7 /COPYING
parent2b93bfac0f5bcabbf60f174f4e7bfa9e318e64d5 (diff)
downloadgit-1dcb3b6478cac3d301349c2df4af2e5ec69dfffe.tar.gz
git-1dcb3b6478cac3d301349c2df4af2e5ec69dfffe.tar.xz
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 'COPYING')
0 files changed, 0 insertions, 0 deletions