mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cherry-pick/revert: add scissors line on merge conflict

Browse Source 
Fix a bug where the scissors line is placed after the Conflicts:
section, in the case where a merge conflict occurs and
commit.cleanup = scissors.

Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Denton Liu
2019-04-17 11:23:30 +01:00
committed by Junio C Hamano
parent dc42e9a83a
commit 1a2b985fb3
7 changed files with 122 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/merge.c
View File

@ -927,14 +927,8 @@ static int suggest_conflicts(void)
* Thus, we will get the cleanup mode which is returned when we _are_
* using an editor.
*/
if (get_cleanup_mode(cleanup_arg, 1) == COMMIT_MSG_CLEANUP_SCISSORS) {
fputc('\n', fp);
wt_status_add_cut_line(fp);
/* comments out the newline from append_conflicts_hint */
fputc(comment_line_char, fp);
}
append_conflicts_hint(&the_index, &msgbuf);
append_conflicts_hint(&the_index, &msgbuf,
get_cleanup_mode(cleanup_arg, 1));
fputs(msgbuf.buf, fp);
strbuf_release(&msgbuf);
fclose(fp);