merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
[gitweb.git] / gettext.h
2011-03-08 i18n: add no-op _() and N_() wrappers