summaryrefslogtreecommitdiff
path: root/git-gui/windows
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2010-12-14 10:18:34 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-16 13:01:31 -0800
commit51baceeec4884c14ac8c77902ec6973ab36421ca (patch)
treea32eb8c6c3b7528a1e6bc69a790c4151839fd254 /git-gui/windows
parentGit 1.7.3.4 (diff)
downloadtgif-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 'git-gui/windows')
0 files changed, 0 insertions, 0 deletions