diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-25 13:59:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 13:59:21 -0700 |
| commit | edefaa55bf202c2d676a0d48545a3720e58d4135 (patch) | |
| tree | 2cf04bdd7a10366dd0e7c2707fcd617f2d58b026 /git-merge-resolve.sh | |
| parent | Merge branch 'js/unmap-before-ext-diff' (diff) | |
| parent | gpg(docs): use correct --verify syntax (diff) | |
| download | tgif-edefaa55bf202c2d676a0d48545a3720e58d4135.tar.xz | |
Merge branch 'rm/gpg-program-doc-fix'
Docfix.
* rm/gpg-program-doc-fix:
gpg(docs): use correct --verify syntax
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions