summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-20 11:33:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-20 11:33:51 -0700
commit5dd54744b8443494f2190d5c9efa4b5ae0f69f06 (patch)
tree640c3ad89ed8f5c39317a7fd3a0de678af3f130c /git-merge-resolve.sh
parentMerge branch 'jt/fetch-negotiator-skipping' (diff)
parentt5318: use 'test_cmp_bin' to compare commit-graph files (diff)
downloadtgif-5dd54744b8443494f2190d5c9efa4b5ae0f69f06.tar.xz
Merge branch 'ds/commit-graph-fsck'
Test fix. * ds/commit-graph-fsck: t5318: use 'test_cmp_bin' to compare commit-graph files
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions