| Document: git-trivial-merge-rules | |
| Title: Trivial merge rules for git read-tree | |
| Author: Daniel Barkalow | |
| Abstract: This document describes the outcomes of the | |
| trivial merge logic in git read-tree. | |
| Section: File Management | |
| Format: Text | |
| Files: /usr/share/doc/git-doc/technical/trivial-merge.txt |