diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-03-17 10:28:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-17 11:24:59 -0700 |
| commit | e568e563ade00bbb0937162f405fc160f253e224 (patch) | |
| tree | 85b019fbd5c486f71708ca833f0aee33c239c60a /git-merge-resolve.sh | |
| parent | Merge branch 'maint-2.4' into maint-2.5 (diff) | |
| download | tgif-e568e563ade00bbb0937162f405fc160f253e224.tar.xz | |
Git 2.5.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions