diff options
Diffstat (limited to 'third_party/git/Documentation/git-merge-one-file.txt')
| -rw-r--r-- | third_party/git/Documentation/git-merge-one-file.txt | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/third_party/git/Documentation/git-merge-one-file.txt b/third_party/git/Documentation/git-merge-one-file.txt deleted file mode 100644 index 04e803d5d336..000000000000 --- a/third_party/git/Documentation/git-merge-one-file.txt +++ /dev/null @@ -1,21 +0,0 @@ -git-merge-one-file(1) -===================== - -NAME ----- -git-merge-one-file - The standard helper program to use with git-merge-index - - -SYNOPSIS --------- -[verse] -'git merge-one-file' - -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 linkgit:git[1] suite |