Minix Man Pages

Man Page or Keyword Search:
Man All Sections 1 - General Commands 2 - System Calls 3 - Subroutines 4 - Special Files 5 - File Formats 6 - Games 7 - Macros and Conventions 8 - Maintenance Commands 9 - Kernel Interface n - New Commands Minix Minix 2.0.0 Minix 3.1.5 Minix 3.1.6 Minix 3.1.7 Minix 3.1.8 Minix 3.2.0 Minix 3.2.1 Minix 3.3.0 X11R7 default i386 Architecture
Apropos Keyword Search (all sections) html pdf ascii Output format

home | help

---

git-merge (1)

Join two or more development histories together

git-merge-base (1)

Find as good common ancestors as possible for a merge

git-merge-file (1)

Run a three-way file merge

git-merge-index (1)

Run a merge for files needing merging

git-merge-one-file (1)

The standard helper program to use with git-merge-index

git-merge-tree (1)

Show three-way merge without touching index

git-mergetool (1)

Run merge conflict resolution tools to resolve merge c...

git-mergetool--lib (1)

Common Git merge tool shell scriptlets