diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:37:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:37:13 -0700 |
| commit | 5e3a3a1527b5ebf4c0c7e3a8394287a04220543f (patch) | |
| tree | c7481477f3bcca1b4798389a27135bd5719fad8f /builtin/merge-tree.c | |
| parent | Sync with maint for l10n updates (diff) | |
| parent | t7406-submodule-update: add missing && (diff) | |
| download | tgif-5e3a3a1527b5ebf4c0c7e3a8394287a04220543f.tar.xz | |
Merge branch 'maint'
* maint:
t7406-submodule-update: add missing &&
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions