Merge branch 'jk/rebase-i-comment-char'

Finishing touches to the earlier core.commentchar topic to cover
"rebase -i" as well.

* jk/rebase-i-comment-char:
  rebase -i: respect core.commentchar

diff --cc git-rebase--interactive.sh
index 8ed7fccc18507b6f3e2508bb117ce056a764de77,5db9e2d3f3666af232e7063bf2c46f3ea8ce79c1..048a140a6f6dd565a0d0d98b3b41439298626a96
--- 1/git-rebase--interactive.sh
--- 2/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -879,9 -878,9 +883,9 @@@ git rev-list $merges_option --pretty=on
  while read -r shortsha1 rest
  do
  
 -      if test -z "$keep_empty" && is_empty_commit $shortsha1
 +      if test -z "$keep_empty" && is_empty_commit $shortsha1 && ! is_merge_commit $shortsha1
        then
-               comment_out="# "
+               comment_out="$comment_char "
        else
                comment_out=
        fi

diff --cc t/t3404-rebase-interactive.sh
Simple merge