1 Document: git-trivial-merge-rules
2 Title: Trivial merge rules for git read-tree
3 Author: Daniel Barkalow
4 Abstract: This document describes the outcomes of the
5 trivial merge logic in git read-tree.
6 Section: File Management
9 Files: /usr/share/doc/git-doc/technical/trivial-merge.txt