diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-12 08:12:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-12 08:12:47 -0700 |
| commit | 5234b41f68ca1ab788513fdc059f9f2e01fd3f6e (patch) | |
| tree | ae50a574a8bee32140e7efeaa784f7b3b176c73e /git-merge-octopus.sh | |
| parent | 3a51467b94306e77c1b69b374bac33b6672bc177 (diff) | |
| parent | 62901179cfbb86e31a4bed098cee9734a701912b (diff) | |
| download | git-5234b41f68ca1ab788513fdc059f9f2e01fd3f6e.tar.gz | |
Merge branch 'tb/document-status-u-tradeoff' into maint
* tb/document-status-u-tradeoff:
i18n: make the translation of -u advice in one go
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions