diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-11-29 12:22:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-29 12:22:13 -0800 |
| commit | 95c2b13a5fc06db6556def93843653e948e71e4b (patch) | |
| tree | f6f1b90a0ce387460e3bb28a6f0399666f14a9b1 /builtin/merge.c | |
| parent | Merge tag 'l10n-2.11.0-rnd3.1' of git://github.com/git-l10n/git-po (diff) | |
| parent | common-main: stop munging argv[0] path (diff) | |
| download | tgif-95c2b13a5fc06db6556def93843653e948e71e4b.tar.xz | |
Merge branch 'jk/common-main'
Fix for a small regression in a topic already in 'master'.
* jk/common-main:
common-main: stop munging argv[0] path
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions