summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorLibravatar Jiang Xin <worldhello.net@gmail.com>2012-10-16 08:39:10 +0800
committerLibravatar Jiang Xin <worldhello.net@gmail.com>2012-10-16 08:39:10 +0800
commit9306b5b9a33185e7867202718162d8a38d5627ab (patch)
tree9eef176459f025bec179ff86e010fdb97945c0ec /t/t6037-merge-ours-theirs.sh
parentMerge branch 'master' of git://github.com/vnwildman/git (diff)
downloadtgif-9306b5b9a33185e7867202718162d8a38d5627ab.tar.xz
l10n: Update git.pot (3 new, 6 removed messages)
This po/git.pot update is generated from v1.8.0-rc2-4-g42e55. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions