global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-23 15:10:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
9dacffc04009529b37c94de9a26420f640cf3f59
git/t/t7506-status-submodule.sh
Junio C Hamano 1d699f7934 Merge branch 'jl/submodule-conflicted-gitmodules' 
* jl/submodule-conflicted-gitmodules:
  Submodules: Don't parse .gitmodules when it contains, merge conflicts
  test that git status works with merge conflict in, .gitmodules
2011-05-19 20:37:21 -07:00

7.0 KiB
Executable File
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink