Reintegrate: make merge-fix-up more noticeable

2011-02-22 14:54:41 -08:00 · 2011-02-22 14:54:41 -08:00 · cc5f90c07c
parent 103d04dc8b
commit cc5f90c07c
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@ -53,6 +53,7 @@ no)
 				:
 			elif git show-ref -q --verify "refs/merge-fix/$branch"
 			then
+				echo >&2 "Fixing up the merge"
 				git cherry-pick --no-commit "refs/merge-fix/$branch" &&
 				EDITOR=: git commit --amend -a || exit
 			fi