aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-09-01 13:40:18 -0700
committerJunio C Hamano <gitster@pobox.com>2022-09-01 13:40:19 -0700
commit014a9ea20774a1e83170ee23fdd606e85dced452 (patch)
tree88986df5204b1c80ea8ebfe6530c94ef25cef429 /builtin/commit.c
parentMerge branch 'en/merge-unstash-only-on-clean-merge' (diff)
parentt4301: add more interesting merge-tree testcases (diff)
downloadgit-014a9ea20774a1e83170ee23fdd606e85dced452.tar.gz
git-014a9ea20774a1e83170ee23fdd606e85dced452.zip
Merge branch 'en/t4301-more-merge-tree-tests'
More tests to protect the current behaviour of "merge-tree" before it gets further updated. * en/t4301-more-merge-tree-tests: t4301: add more interesting merge-tree testcases
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions