diff options
author | Michael J Gruber <git@drmicha.warpmail.net> | 2010-12-14 10:18:34 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-12-16 13:01:31 -0800 |
commit | 51baceeec4884c14ac8c77902ec6973ab36421ca (patch) | |
tree | a32eb8c6c3b7528a1e6bc69a790c4151839fd254 /Documentation/git-unpack-file.txt | |
parent | Git 1.7.3.4 (diff) | |
download | tgif-51baceeec4884c14ac8c77902ec6973ab36421ca.tar.xz |
git-difftool.txt: correct the description of $BASE and describe $MERGED
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-unpack-file.txt')
0 files changed, 0 insertions, 0 deletions