diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-09-02 13:18:42 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-09-02 13:18:42 -0700 |
commit | a536a9db08a1f5ac327940a25e42d30a54730105 (patch) | |
tree | 5829aaf2433511844d36c67b4757ab86404433bd /builtin/merge-recursive.c | |
parent | Merge branch 'tr/maint-t3903-misquoted-command' (diff) | |
parent | bisect: take advantage of gettextln, eval_gettextln. (diff) | |
download | tgif-a536a9db08a1f5ac327940a25e42d30a54730105.tar.xz |
Merge branch 'js/i18n-scripts-2'
* js/i18n-scripts-2:
bisect: take advantage of gettextln, eval_gettextln.
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions