X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-one-file.txt;h=1dd134538da40a1f3547c55c49be3b418e6be0ab;hb=7ed3fed33dd71adad863d350b7a501a12cb94d07;hp=f35d0e1b4560a4970e7423011b585e1ff7d538c1;hpb=b8de7f764e1a9f6e8dfb587a6145906394fa607d;p=git.git diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt index f35d0e1b4..1dd134538 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 ------ @@ -26,4 +26,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list