summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-06-25 11:24:20 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-25 11:24:20 -0700
commit9b3dacc95fc6259b116207b4ac345ffb9e86ea3b (patch)
tree6cc1491427743772be2c426efe679fd8b7d7a828 /Documentation/git-merge-index.txt
parentMerge branch 'jk/no-more-asciidoc7' (diff)
parentRemove i18n legos in notifying new branch tracking setup (diff)
downloadtgif-9b3dacc95fc6259b116207b4ac345ffb9e86ea3b.tar.xz
Merge branch 'nd/i18n-branch-lego'
Restructure the way message strings are created, in preparation for marking them for i18n. * nd/i18n-branch-lego: Remove i18n legos in notifying new branch tracking setup
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions