diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-07-24 14:50:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-24 14:50:35 -0700 |
| commit | 5800c63717ae35286a1441f14ffff753e01f7e2b (patch) | |
| tree | 47d109315ab006388a72b91fe9efed19c83ea968 /builtin/merge-ours.c | |
| parent | Merge https://github.com/git-l10n/git-po (diff) | |
| download | tgif-5800c63717ae35286a1441f14ffff753e01f7e2b.tar.xz | |
Git 2.14-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions