diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
| commit | fce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch) | |
| tree | ffce2ae419b52786a0e567f4fddaadd89016f62c /git-merge-one-file.txt | |
| parent | bb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff) | |
| download | git-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz | |
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'git-merge-one-file.txt')
| -rw-r--r-- | git-merge-one-file.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge-one-file.txt b/git-merge-one-file.txt index 5c9ce641e..62e09afe1 100644 --- a/git-merge-one-file.txt +++ b/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 ------ |