]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 08e3ce5) | patch
merge & sequencer: unify codepaths that write "Conflicts:" hint
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Oct 2014 18:34:59 +0000 (11:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Oct 2014 18:34:59 +0000 (11:34 -0700)
commit75c961b767ec061696634c1079dbe5f1a9e10f93
tree427dd8822ab47c3f4ad827022bf73a8d9b6d4271tree | snapshot
parent08e3ce5a20d738746b2a7700be6d3954bf01a2b9commit | diff
merge & sequencer: unify codepaths that write "Conflicts:" hint

Two identical loops in suggest_conflicts() in merge, and
do_recursive_merge() in sequencer, can use a single helper function
extracted from the latter that prepares the "Conflicts:" hint that
is meant to remind the user the paths for which merge conflicts had
to be resolved to write a better commit log message.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge.c diff | blob | blame | history
sequencer.c diff | blob | blame | history
sequencer.h diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.