summaryrefslogtreecommitdiff
path: root/merge-blobs.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-02-25 16:43:31 -0800
committerJunio C Hamano <gitster@pobox.com>2021-02-25 16:43:31 -0800
commit6eea44cee1dc94a7d6f7fa768d5710f9385f22db (patch)
treedc9ac2d574c1ba05912e446cab6400c04c0fd578 /merge-blobs.c
parentccf6861b7272f99ab078345e1ee6d6b37b742cc0 (diff)
parent1c881026a1eebadd1eae8cc3a4418b010df35bee (diff)
Merge branch 'zh/difftool-skip-to'
"git difftool" learned "--skip-to=<path>" option to restart an interrupted session from an arbitrary path. * zh/difftool-skip-to: difftool.c: learn a new way start at specified file
Diffstat (limited to 'merge-blobs.c')
0 files changed, 0 insertions, 0 deletions