i18n: advice: internationalize message for conflicts
authorVasco Almeida <vascomalmeida@sapo.pt>
Fri, 17 Jun 2016 20:20:52 +0000 (20:20 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Jun 2016 22:45:48 +0000 (15:45 -0700)
commit8785c42...320e9288d13f0218e591a8aa5c57479c
tree355547c...64734faa4e47f834f62972c5cc097fa0copy hash to clipboard (tree)
parente9f3cec...94330a86a412adaee95360ddea6fcf54copy hash to clipboard (diff)
advice.c
builtin/pull.c
t/t5520-pull.sh