![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Charles Bailey <charles@hashpling.org> | |
| Thu, 21 Feb 2008 23:30:34 +0000 (23:30 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Mar 2008 20:07:03 +0000 (12:07 -0800) | ||
| commit | b3ea27e4de24c7006969f493ba6bfbbc5b572d80 | |
| tree | 8c9cd3b7068aaccba443577ec92b78eb46bb7e8e | tree | snapshot |
| parent | 44c36d1ccc9a40bfb31910dfd7e18d59fa8be502 | commit | diff |
Changed an internal variable of mergetool to support custom commands
The variable $path changes to $MERGED so that it is more consistent
with $BASE, $LOCAL and $REMOTE for future custom command lines.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The variable $path changes to $MERGED so that it is more consistent
with $BASE, $LOCAL and $REMOTE for future custom command lines.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-mergetool.sh | diff | blob | history |