diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-07 11:09:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-07 11:09:04 -0700 |
| commit | e245397434f8d26bf18053823c3fb9d1374679bd (patch) | |
| tree | 286620eaf35b17ab5df0a7d4e8fe42d51a2b79fd /builtin/merge-tree.c | |
| parent | Merge branch 'jk/config-warn-on-inaccessible-paths' (diff) | |
| parent | am: quote string for translation before passing to eval_gettextln (diff) | |
| download | tgif-e245397434f8d26bf18053823c3fb9d1374679bd.tar.xz | |
Merge branch 'nd/am-i18n-fix'
"git am" wasn't marked up for i18n properly.
* nd/am-i18n-fix:
am: quote string for translation before passing to eval_gettextln
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions