summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Jiang Xin <worldhello.net@gmail.com>2018-12-13 22:24:25 +0800
committerLibravatar Jiang Xin <worldhello.net@gmail.com>2018-12-13 22:24:25 +0800
commit3e35df95ae2f8bbeaca142eac086978ae544a9c2 (patch)
tree015c90d28e3b6e1a17d106188c54a4f8f293de1d /Documentation/git-merge-file.txt
parentGit 2.20 (diff)
parentl10n: Update Catalan translation (diff)
downloadtgif-3e35df95ae2f8bbeaca142eac086978ae544a9c2.tar.xz
Merge branch 'master' of https://github.com/Softcatala/git-po
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions