summaryrefslogtreecommitdiff
path: root/t/t4013/diff.config_format.subjectprefix_DIFFERENT_PREFIX
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-12-06 16:15:45 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-26 14:46:15 -0800
commit8dd15c6a909c059c6fd4f4dd914dbf932617ea57 (patch)
treebf2cbf070ec300356dc3910fd673d8e4f7ff2cc3 /t/t4013/diff.config_format.subjectprefix_DIFFERENT_PREFIX
parentmerge-tree: lose unused "resolve_directories" (diff)
downloadtgif-8dd15c6a909c059c6fd4f4dd914dbf932617ea57.tar.xz
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>
Diffstat (limited to 't/t4013/diff.config_format.subjectprefix_DIFFERENT_PREFIX')
0 files changed, 0 insertions, 0 deletions