Sign in
googlers
/
jrn
/
git
/
493c774e58a05bbbac06e4ae1654ca3d24e4e5cf
/
git-merge-resolve.sh
3dff537
Assorted typo fixes
by Pavel Roskin
· 18 years ago
1b1fdf8
read-tree --aggressive
by Junio C Hamano
· 19 years ago
88f8f0a
[PATCH] Enable and fix support for base less merges.
by Fredrik Kuivinen
· 19 years ago
2276aa6
Use Daniel's read-tree in the merge strategy 'resolve'.
by Junio C Hamano
· 19 years ago
91063bb
Multi-backend merge driver.
by Junio C Hamano
· 19 years ago