![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Michael J Gruber <git@drmicha.warpmail.net> | |
| Tue, 14 Dec 2010 09:18:34 +0000 (10:18 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 16 Dec 2010 21:01:31 +0000 (13:01 -0800) | ||
| commit | 51baceeec4884c14ac8c77902ec6973ab36421ca | |
| tree | a32eb8c6c3b7528a1e6bc69a790c4151839fd254 | tree | snapshot |
| parent | fa1c8542cb3ed2a193aac2e514ebe12d7fe22a04 | commit | diff |
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>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-difftool.txt | diff | blob | history |