[PATCH] Fix assertion failure when merging common ancestors.
[git.git] / Documentation / technical /
2005-09-11 Daniel Barkalow[PATCH] Document the trivial merge rules for 3(+more...