| commit | 4209752da5a2e327e470493618931a7abbf0a381 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 12 Jun 2008 21:30:37 +0000 (12 14:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 12 Jun 2008 21:30:51 +0000 (12 14:30 -0700) | ||
| tree | 02bc98317f3e7355eab1983b4f3568a37bdb0975 | treesnapshot (tar.gz zip) |
| parent | 9501fc894566f4d27a9823407555f3039273162c | commitdiff |
user-manual: describe how higher stages are set during a merge
Higher stages store the blobs involved from their side verbatim. Removal
of uninteresting hunks are done by "diff --cc" upon demand and not stored
in the index.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Higher stages store the blobs involved from their side verbatim. Removal
of uninteresting hunks are done by "diff --cc" upon demand and not stored
in the index.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/user-manual.txt | diffblobblamehistory |