about summary refs log tree commit diff
path: root/t/t6037-merge-ours-theirs.sh