]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ff6bbce d957355)
Merge branch 'en/merge-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Oct 2018 07:16:00 +0000 (16:16 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Oct 2018 07:16:00 +0000 (16:16 +0900)
commit74bb46354f79e68751a59b65166fb9a53f0e2b0f
tree14f659f51486887dae2486b62bb556d28151c051tree | snapshot
parentff6bbce6e3dd89a5852ddb657554f9209091202ecommit | diff
parentd95735567550e87c8e58a92126c45f1a3875603acommit | diff
Merge branch 'en/merge-cleanup'

Code clean-up.

* en/merge-cleanup:
  merge-recursive: rename merge_file_1() and merge_content()
  merge-recursive: remove final remaining caller of merge_file_one()
  merge-recursive: avoid wrapper function when unnecessary and wasteful
  merge-recursive: set paths correctly when three-way merging content
merge-recursive.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.