blob: b6ae363a0bba5a0adfda059affa802b6ec2f4631 (
plain)
1
2
3
4
5
6
7
8
9
|
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
|
