summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2013-10-30 06:33:11 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-10-30 14:16:42 -0700
commit76ea6717fe7dda28966f586e09e02b7b0d5b76cf (patch)
tree7e7341f5354ca5b8a760fe7b92fd7f7fac88fb16 /Documentation/git-merge-tree.txt
parentref_remote_duplicates(): extract a function handle_duplicate() (diff)
downloadtgif-76ea6717fe7dda28966f586e09e02b7b0d5b76cf.tar.xz
handle_duplicate(): mark error message for translation
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions