##// END OF EJS Templates
vcs: Return merge reference in merge response....
vcs: Return merge reference in merge response. Previously we returned only the merge commit id. Now we set a bookmark(hg) or branch reference(git) to point to the merge commit. By returning a merge reference we have both informations available (id and name)

File last commit:

r1:854a839a default
r1051:668a5e47 default
Show More
config
18 lines | 698 B | text/plain | TextLexer
[main]
host = https://www.transifex.com
[RhodeCode.pot]
source_file = rhodecode/i18n/rhodecode.pot
source_lang = en
type = PO
trans.be = rhodecode/i18n/be/LC_MESSAGES/rhodecode.po
trans.de = rhodecode/i18n/de/LC_MESSAGES/rhodecode.po
trans.es = rhodecode/i18n/es/LC_MESSAGES/rhodecode.po
trans.fr = rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po
trans.it = rhodecode/i18n/it/LC_MESSAGES/rhodecode.po
trans.ja = rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po
trans.pl = rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po
trans.pt = rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po
trans.ru = rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po
trans.zh = rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po