summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2020-08-10 22:29:16 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-10 15:59:01 -0700
commit1cb588775f3b5fef9c10b1f9b580521007b390ea (patch)
treea7c0fee759be7e72f167175979954ae86e482221 /builtin/merge-ours.c
parentt6416, t6423: clarify some comments and fix some typos (diff)
downloadtgif-1cb588775f3b5fef9c10b1f9b580521007b390ea.tar.xz
t6423: add an explanation about why one of the tests does not pass
I had long since forgotten the idea behind this test and why it failed, and took a little while to figure it out. To prevent others from having to spend a similar time on it, add an explanation in the comments. However, the reasoning in the explanation makes me question why I considered it a failure at all. I'm not sure if I had a better reason when I originally wrote it, but for now just add commentary about the possible expectations and why it behaves the way it does right now. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions