tree dc9ac2d574c1ba05912e446cab6400c04c0fd578
parent ccf6861b7272f99ab078345e1ee6d6b37b742cc0
parent 1c881026a1eebadd1eae8cc3a4418b010df35bee
author Junio C Hamano <gitster@pobox.com> 1614300211 -0800
committer Junio C Hamano <gitster@pobox.com> 1614300211 -0800

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