X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fuser-manual.txt;h=84dfbf42ecbb8aee77bfc11d94179fdb8dbd50fa;hb=fa8347b81609429d578bd67695bf19b096b10f4c;hp=fecc4eb5b3b853f4781c769fff8337e8bb6c3500;hpb=9502751181df4a1347b3bd0fe2f0f0cde9cfaa91;p=git.git diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index fecc4eb5b..84dfbf42e 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -2439,9 +2439,9 @@ You have performed no merges into mywork, so it is just a simple linear sequence of patches on top of "origin": ................................................ - o--o--o <-- origin + o--o--O <-- origin \ - o--o--o <-- mywork + a--b--c <-- mywork ................................................ Some more interesting work has been done in the upstream project, and