summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-21 11:46:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-21 16:05:42 -0700
commite454a83fa2640166aba77ef3fe2bfb81949895b8 (patch)
tree2649d8690689b2b01dcdaff84c11ef20b47a3bd6 /t/t6037-merge-ours-theirs.sh
parentMerge branch 'po/insn-editor' (diff)
downloadtgif-e454a83fa2640166aba77ef3fe2bfb81949895b8.tar.xz
Update draft release notes to 1.7.8
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions