git.octo.it Git - git.git/history - git-merge-stupid.sh

projects / git.git / history

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

[git.git] / git-merge-stupid.sh

2005-09-11	Junio C Hamano	Use Daniel's read-tree in the merge strategy 'resolve'.	blob \| commitdiff

The core git plumbing