File: git-doc.doc-base.git-trivial-merge-rules

package info (click to toggle)
git 1%3A1.7.10.4-1%2Bwheezy3
  • links: PTS, VCS
  • area: main
  • in suites: wheezy
  • size: 22,468 kB
  • sloc: ansic: 131,677; sh: 101,927; perl: 25,746; tcl: 20,816; python: 4,441; makefile: 3,418; lisp: 1,785; asm: 98
file content (9 lines) | stat: -rw-r--r-- 293 bytes parent folder | download | duplicates (11) 
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