diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-02-27 10:35:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 10:53:41 -0800 |
| commit | 2fc74f41c50562d76defa0617db5bcb7e5216272 (patch) | |
| tree | 78ecaf9c97585c1859e59d98d18fe96ee90c8b7d /git-merge-resolve.sh | |
| parent | Sync with maint (diff) | |
| download | tgif-2fc74f41c50562d76defa0617db5bcb7e5216272.tar.xz | |
Fifth batch for 2.17
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions