summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-04-18 11:17:22 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-18 11:17:23 -0700
commit427ed406cda52f07b36dd8fe69c8c7ad6e6ae39a (patch)
treea15236415fb167fa1e4ba3d25531610f88da2de8 /Documentation/git-merge-tree.txt
parentUpdate draft release notes for 2.0 (diff)
parentprompt: fix missing file errors in zsh (diff)
downloadtgif-427ed406cda52f07b36dd8fe69c8c7ad6e6ae39a.tar.xz
Merge branch 'fc/prompt-zsh-read-from-file'
* fc/prompt-zsh-read-from-file: prompt: fix missing file errors in zsh
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions