Merge branch 'maint-1.5.4' into maint
[gitweb.git] / Documentation / technical / trivial-merge.txt
2005-09-11 [PATCH] Document the trivial merge rules for 3(+more...