| commit | 8dd15c6a909c059c6fd4f4dd914dbf932617ea57 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Dec 2012 00:15:45 +0000 (6 16:15 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Dec 2012 22:46:15 +0000 (26 14:46 -0800) | ||
| tree | bf2cbf070ec300356dc3910fd673d8e4f7ff2cc3 | treesnapshot (tar.gz zip) |
| parent | 3b8ff51b708e52e4ae2b8f266d25c187c3152820 | commitdiff |
merge-tree: add comments to clarify what these functions are doing
Rename the "branch1" parameter given to resolve() to "ours", to
clarify what is going on. Also, annotate the unresolved_directory()
function with some comments to show what decisions are made in each
step, and highlight two bugs that need to be fixed.
Add two tests to t4300 to illustrate these bugs.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Rename the "branch1" parameter given to resolve() to "ours", to
clarify what is going on. Also, annotate the unresolved_directory()
function with some comments to show what decisions are made in each
step, and highlight two bugs that need to be fixed.
Add two tests to t4300 to illustrate these bugs.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge-tree.c | diffblobblamehistory | |
| t/t4300-merge-tree.sh | diffblobblamehistory |