[PATCH] Finish documenting trivial merge rules