From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Feb 2021 00:43:31 +0000 (-0800)
Subject: Merge branch 'zh/difftool-skip-to'
X-Git-Tag: v2.31.0-rc0~12
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=6eea44cee1dc94a7d6f7fa768d5710f9385f22db

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
---

6eea44cee1dc94a7d6f7fa768d5710f9385f22db