/usr/share/doc-base/git-trivial-merge-rules is in git-doc 1:2.7.4-0ubuntu1.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
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
|