|
NAMEgit-merge-one-file - The standard helper program to use with git-merge-indexSYNOPSISgit merge-one-file DESCRIPTIONThis 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.GITPart of the git(1) suite
Visit the GSP FreeBSD Man Page Interface. |