Sign in
googlers
/
jrn
/
git
/
c8ddd2aa116710e3442bc54cd750824a88a900d4
/
git-merge-resolve.sh
7bd93c1
Convert to use quiet option when available
by Dan Loewenherz
· 16 years ago
7d3c82a
Fixing comment in merge strategies
by Tom Clarke
· 17 years ago
5be6007
Rewrite "git-frotz" to "git frotz"
by Junio C Hamano
· 18 years ago
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