summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorAlexandre Julliard <julliard@winehq.org>2006-11-03 16:42:43 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-11-04 09:50:35 (GMT)
commit2379d61fa6355bc7a8cc8b5dce87a7d4a9505c76 (patch)
tree6e37b53ef9a82044a4beba62344b702bc6c163c3 /builtin-apply.c
parent2ac2b19601cd8db8660a8d55647079f1ff4885b1 (diff)
downloadgit-2379d61fa6355bc7a8cc8b5dce87a7d4a9505c76.zip
git-2379d61fa6355bc7a8cc8b5dce87a7d4a9505c76.tar.gz
git-2379d61fa6355bc7a8cc8b5dce87a7d4a9505c76.tar.bz2
git.el: Include MERGE_MSG in the log-edit buffer even when not committing a merge.
This lets us take advantage of the fact that git-cherry-pick now saves the message in MERGE_MSG too. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-apply.c')
0 files changed, 0 insertions, 0 deletions