summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Christopher Diaz Riveros <christopher.diaz.riv@gmail.com>2020-05-17 18:51:17 -0500
committerLibravatar Christopher Diaz Riveros <chrisadr@gentoo.org>2020-05-17 18:51:17 -0500
commit848c9e1d9e1ce95cb0d65dce6f1a16b361877e7c (patch)
treefb035ca9275af19ff440b88122d2fc439ac3a795 /builtin/merge-ours.c
parentMerge branch 'master' of github.com:alshopov/git-po into git-po-master (diff)
downloadtgif-848c9e1d9e1ce95cb0d65dce6f1a16b361877e7c.tar.xz
l10n: es: 2.27.0 round 1
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions