socklen_t is unsigned int on most Linux platforms
[git] / git-merge-recursive.py
2005-09-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-25  Fredrik Kuivinen[PATCH] recursive-merge: Don't print a stack trace...
2005-09-14  Junio C HamanoMerge branch 'master' of .
2005-09-14  Junio C Hamanogit-merge-recursive: Trivial RE fixes.
2005-09-13  Fredrik Kuivinen[PATCH] Use a temporary index file when we merge the...
2005-09-13  Fredrik Kuivinen[PATCH] Adjust git-merge-recursive.py for the new tool...
2005-09-13  Fredrik Kuivinen[PATCH] Don't output 'Automatic merge failed, ...'
2005-09-13  Fredrik Kuivinen[PATCH] Be more like the 'resolve' strategy.
2005-09-13  Fredrik Kuivinen[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.