Merge branch 'zh/difftool-skip-to'
authorJunio C Hamano <redacted>
Fri, 26 Feb 2021 00:43:31 +0000 (16:43 -0800)
committerJunio C Hamano <redacted>
Fri, 26 Feb 2021 00:43:31 +0000 (16:43 -0800)
"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


Trivial merge
git clone https://git.99rst.org/PROJECT