summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-24 18:34:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-24 18:34:59 (GMT)
commit75c961b767ec061696634c1079dbe5f1a9e10f93 (patch)
tree427dd8822ab47c3f4ad827022bf73a8d9b6d4271 /builtin/commit.c
parent08e3ce5a20d738746b2a7700be6d3954bf01a2b9 (diff)
downloadgit-75c961b767ec061696634c1079dbe5f1a9e10f93.zip
git-75c961b767ec061696634c1079dbe5f1a9e10f93.tar.gz
git-75c961b767ec061696634c1079dbe5f1a9e10f93.tar.bz2
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>
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions