diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-11-29 20:22:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-29 20:22:13 (GMT) |
| commit | 95c2b13a5fc06db6556def93843653e948e71e4b (patch) | |
| tree | f6f1b90a0ce387460e3bb28a6f0399666f14a9b1 /builtin/merge.c | |
| parent | 061eeff104e74e50a6ddeed5b4a5fb382767742f (diff) | |
| parent | 6854a8f5c9ecf32f5bd85020e77d48d3ffdf48fc (diff) | |
| download | git-95c2b13a5fc06db6556def93843653e948e71e4b.zip git-95c2b13a5fc06db6556def93843653e948e71e4b.tar.gz git-95c2b13a5fc06db6556def93843653e948e71e4b.tar.bz2 | |
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