diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-31 14:07:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-31 14:12:15 -0700 |
| commit | 60bd4b1c513bb652cdffad44382046ca872140eb (patch) | |
| tree | 244c35885eef993dcd8f0378667eaa7c45952258 /git-merge-resolve.sh | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-60bd4b1c513bb652cdffad44382046ca872140eb.tar.xz | |
Git 2.9-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions