summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-12 23:14:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-12 23:14:14 (GMT)
commitce5cf6ffc6feb9fb4f9a50cdfa2f527fa119c94f (patch)
treeb28736528a5a0d8ddf7b05fd24974f913d6b6035 /t/t3507-cherry-pick-conflict.sh
parent6b149cee20cfa6f525964cdf1f386b47894fd758 (diff)
parent9a4f34bb6d11ab47d532f7798ecc2b051f6d8893 (diff)
downloadgit-ce5cf6ffc6feb9fb4f9a50cdfa2f527fa119c94f.zip
git-ce5cf6ffc6feb9fb4f9a50cdfa2f527fa119c94f.tar.gz
git-ce5cf6ffc6feb9fb4f9a50cdfa2f527fa119c94f.tar.bz2
Merge git://github.com/git-l10n/git-po
* git://github.com/git-l10n/git-po: l10n: Update Swedish translation (1166t0f0u) l10n: vi.po: update to v1.7.12-146-g16d26 l10n: de.po: translate 2 new messages l10n: zh_CN.po: translate 2 new messages l10n: Update git.pot (2 new, 4 removed messages) l10n: vi.po & TEAMS: review Vietnamese translation
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions