]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fd53b7f) | patch
merge-recursive: move more is_dirty handling to merge_content
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:58:17 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:11:00 +0000 (16:11 +0900)
commitbd42380ef1ec773d1557b28ba6924f4020333143
treea0192a413ae136d555a269b8b685c77ecc730591tree | snapshot
parentfd53b7ffd1bd499d24fa48b43a79703355bde512commit | diff
merge-recursive: move more is_dirty handling to merge_content

conflict_rename_normal() was doing some handling for dirty files that
more naturally belonged in merge_content.  Move it, and rename a
parameter for clarity while at it.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.