projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3b8ff51) | patch
merge-tree: add comments to clarify what these functions are doing
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Dec 2012 00:15:45 +0000 (16:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Dec 2012 22:46:15 +0000 (14:46 -0800)
commit8dd15c6a909c059c6fd4f4dd914dbf932617ea57
treebf2cbf070ec300356dc3910fd673d8e4f7ff2cc3tree | snapshot
parent3b8ff51b708e52e4ae2b8f266d25c187c3152820commit | diff
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>
builtin/merge-tree.c diff | blob | history
t/t4300-merge-tree.sh diff | blob | history
Git—the stupid content tracker