diff options
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
| -rw-r--r-- | Documentation/git-merge-one-file.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt index 5c9ce641ec..62e09afe13 100644 --- a/Documentation/git-merge-one-file.txt +++ b/Documentation/git-merge-one-file.txt @@ -12,8 +12,8 @@ SYNOPSIS 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". +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`. Author ------ |