Платформа ЦРНП "Мирокод" для разработки проектов https://git.mirocod.ru

giteagithubgogolangmirocodproject-treeuser-maptask-tree

You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Tree: f1e85622da

dev_mirocod

main

release/v1.10

release/v1.11

release/v1.12

release/v1.13

release/v1.14

release/v1.15

release/v1.16

release/v1.8

release/v1.9

repo_rename

sergey_aksenov-patch-2

tree_zoom

v0.9.99

v1.0.0

v1.0.1

v1.0.2

v1.1.0

v1.1.1

v1.1.2

v1.1.3

v1.1.4

v1.10.0

v1.10.0-dev

v1.10.0-rc1

v1.10.0-rc2

v1.10.1

v1.10.2

v1.10.3

v1.10.4

v1.10.5

v1.10.6

v1.11.0

v1.11.0-dev

v1.11.0-rc1

v1.11.0-rc2

v1.11.1

v1.11.2

v1.11.3

v1.11.4

v1.11.5

v1.11.6

v1.11.7

v1.11.8

v1.12.0

v1.12.0-dev

v1.12.0-rc1

v1.12.0-rc2

v1.12.1

v1.12.2

v1.12.3

v1.12.4

v1.12.5

v1.12.6

v1.13.0

v1.13.0-dev

v1.13.0-rc1

v1.13.0-rc2

v1.13.1

v1.13.2

v1.13.3

v1.13.4

v1.13.5

v1.13.6

v1.13.7

v1.14.0

v1.14.0-dev

v1.14.0-rc1

v1.14.0-rc2

v1.14.1

v1.14.2

v1.14.3

v1.14.4

v1.14.5

v1.14.6

v1.14.7

v1.15.0

v1.15.0-dev

v1.15.0-rc1

v1.15.0-rc2

v1.15.0-rc3

v1.15.1

v1.15.10

v1.15.11

v1.15.2

v1.15.3

v1.15.4

v1.15.5

v1.15.6

v1.15.7

v1.15.8

v1.15.9

v1.16.0

v1.16.0-dev

v1.16.0-rc1

v1.16.1

v1.16.2

v1.16.3

v1.16.4

v1.16.5

v1.16.6

v1.16.7

v1.16.8

v1.17.0-dev

v1.2.0

v1.2.0-rc1

v1.2.0-rc2

v1.2.0-rc3

v1.2.1

v1.2.2

v1.2.3

v1.3.0

v1.3.0-rc1

v1.3.0-rc2

v1.3.1

v1.3.2

v1.3.3

v1.4.0

v1.4.0-rc1

v1.4.0-rc2

v1.4.0-rc3

v1.4.1

v1.4.2

v1.4.3

v1.5.0

v1.5.0-dev

v1.5.0-rc1

v1.5.0-rc2

v1.5.1

v1.5.2

v1.5.3

v1.6.0

v1.6.0-dev

v1.6.0-rc1

v1.6.0-rc2

v1.6.1

v1.6.2

v1.6.3

v1.6.4

v1.7.0

v1.7.0-dev

v1.7.0-rc1

v1.7.0-rc2

v1.7.0-rc3

v1.7.1

v1.7.2

v1.7.3

v1.7.4

v1.7.5

v1.7.6

v1.8.0

v1.8.0-rc1

v1.8.0-rc2

v1.8.0-rc3

v1.8.1

v1.8.2

v1.8.3

v1.9.0

v1.9.0-dev

v1.9.0-rc1

v1.9.0-rc2

v1.9.1

v1.9.2

v1.9.3

v1.9.4

v1.9.5

v1.9.6

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'f1e85622da'

${ noResults }

Platform_Mirocod/services/pull

History

zeripath f1e85622da Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004) ... The current TestPatch conflict code uses a plain git apply which does not properly account for 3-way merging. However, we can improve things using `git read-tree -m` to do a three-way merge then follow the algorithm used in merge-one-file. We can also use `--patience` and/or `--histogram` to generate a nicer diff for applying patches too. Fix #13679 Fix #6417 Signed-off-by: Andrew Thornton <art27@cantab.net>		3 years ago
..
check.go	…
check_test.go	…
commit_status.go	…
lfs.go	…
main_test.go	…
merge.go	…
patch.go	Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004)	3 years ago
patch_unmerged.go	Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004)	3 years ago
pull.go	…
pull_test.go	…
review.go	…
temp_repo.go	…
update.go	…