diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-01-31 22:01:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-31 22:01:14 -0800 |
| commit | 87a23e77c6ffc5713eff3a4a4da036731da2dc3f (patch) | |
| tree | c27eb251dd5637829ec2ce5c8d50f5298c13a1de /Documentation/merge-strategies.txt | |
| parent | completion: --edit and --no-edit for git-merge (diff) | |
| parent | i18n of multi-line advice messages (diff) | |
| download | tgif-87a23e77c6ffc5713eff3a4a4da036731da2dc3f.tar.xz | |
Merge branch 'jc/advise-i18n'
* jc/advise-i18n:
i18n of multi-line advice messages
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions