summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-10 14:11:18 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-10 14:11:18 -0800
commitf6f3921db69a42f0a73d03efd48a2e776dd7ff92 (patch)
treeb09d3344babc9a44fb27de5d238d02d70d23096b /Documentation/git-merge-tree.txt
parentMerge branch 'tb/test-t9810-no-sed-i' into maint (diff)
parentRemove Documentation/pt_BR/gittutorial.txt (diff)
downloadtgif-f6f3921db69a42f0a73d03efd48a2e776dd7ff92.tar.xz
Merge branch 'ta/remove-stale-translated-tut' into maint
* ta/remove-stale-translated-tut: Remove Documentation/pt_BR/gittutorial.txt
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions