diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-04-19 10:58:17 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-08 16:11:00 +0900 |
| commit | bd42380ef1ec773d1557b28ba6924f4020333143 (patch) | |
| tree | a0192a413ae136d555a269b8b685c77ecc730591 /upload-pack.c | |
| parent | merge-recursive: improve add_cacheinfo error handling (diff) | |
| download | tgif-bd42380ef1ec773d1557b28ba6924f4020333143.tar.xz | |
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>
Diffstat (limited to 'upload-pack.c')
0 files changed, 0 insertions, 0 deletions