English ▾Topics ▾Email
Latest version
▾ git-merge-one-file last updated in 2.0.5Changes in the git-merge-one-file manual
Setup and Config
Getting and Creating Projects
Basic Snapshotting
Branching and Merging
Sharing and Updating Projects
Inspection and Comparison
Patching
Debugging
External Systems
Server Admin
- 2.1.4 → 2.46.1 no changes
- 2.0.5 12/17/14
DESCRIPTION
This is the standard helper program to use with git merge-index to resolve a merge after the trivial merge done with git read-tree -m.
GIT
Part of the git[1] suite