diff options
Diffstat (limited to '')
| -rw-r--r-- | debian/git-doc.doc-base.git-trivial-merge-rules | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/debian/git-doc.doc-base.git-trivial-merge-rules b/debian/git-doc.doc-base.git-trivial-merge-rules new file mode 100644 index 0000000..b6ae363 --- /dev/null +++ b/debian/git-doc.doc-base.git-trivial-merge-rules @@ -0,0 +1,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 |