thodg/libgit2/tests/resources/merge-resolve/.gitted/refs/heads

Diff

• Show log

  Commit

• Hash : 2a3e0635
  Author :
  Date : 2017-12-04T16:56:07
  

  Do not attempt to check out submodule as blob when merging a submodule modify/deltete conflict
  

• Files

• branch
• delete-submodule
• df_ancestor
• df_side1
• df_side2
• ff_branch
• master
• octo1
• octo2
• octo3
• octo4
• octo5
• octo6
• previous
• rename_conflict_ancestor
• rename_conflict_ours
• rename_conflict_theirs
• renames1
• renames2
• submodule_rename1
• submodule_rename2
• submodules
• submodules-branch
• submodules-branch2
• trivial-10
• trivial-10-branch
• trivial-11
• trivial-11-branch
• trivial-13
• trivial-13-branch
• trivial-14
• trivial-14-branch
• trivial-2alt
• trivial-2alt-branch
• trivial-3alt
• trivial-3alt-branch
• trivial-4
• trivial-4-branch
• trivial-5alt-1
• trivial-5alt-1-branch
• trivial-5alt-2
• trivial-5alt-2-branch
• trivial-6
• trivial-6-branch
• trivial-7
• trivial-7-branch
• trivial-8
• trivial-8-branch
• trivial-9
• trivial-9-branch
• unrelated

• Properties

• Git HTTP	https://git.kmx.io/thodg/libgit2.git
  Git SSH	git@git.kmx.io:thodg/libgit2.git
  Public access ?	public
  Description	https://libgit2.org/
  Users
  Tags	v1.5.0 v1.4.4 v1.4.3 v1.4.2 v1.4.1 v1.4.0 v1.3.2 v1.3.1 v1.3.0 v1.2.0 v1.1.1 v1.1.0 v1.0.1 v1.0.0 v0.99.0 v0.8.0 v0.3.0 v0.28.5 v0.28.4 v0.28.3 v0.28.2 v0.28.1 v0.28.0-rc1 v0.28.0 v0.27.9 v0.27.8 v0.27.7 v0.27.6 v0.27.5 v0.27.4 v0.27.3 v0.27.2 v0.27.10 v0.27.1 v0.27.0-rc3 v0.27.0-rc2 v0.27.0-rc1 v0.27.0 v0.26.8 v0.26.7 v0.26.6 v0.26.5 v0.26.4 v0.26.3 v0.26.2 v0.26.1 v0.26.0-rc2 v0.26.0-rc1 v0.26.0 v0.25.1 v0.25.0-rc2 v0.25.0-rc1 v0.25.0 v0.24.6 v0.24.5 v0.24.4 v0.24.3 v0.24.2 v0.24.1 v0.24.0-rc1 v0.24.0 v0.23.4 v0.23.3 v0.23.2 v0.23.1 v0.23.0-rc2 v0.23.0-rc1 v0.23.0 v0.22.3 v0.22.2 v0.22.1 v0.22.0-rc2 v0.22.0-rc1 v0.22.0 v0.21.5 v0.21.4 v0.21.3 v0.21.2 v0.21.1 v0.21.0-rc2 v0.21.0-rc1 v0.21.0 v0.20.0 v0.2.0 v0.19.0 v0.18.0 v0.17.0 v0.16.0 v0.15.0 v0.14.0 v0.13.0 v0.12.0 v0.11.0 v0.10.0 v0.1.0