diff options
| author |  Charles Bailey <charles@hashpling.org> | 2008-02-21 23:30:34 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-03-05 12:07:03 -0800 |
| commit | b3ea27e4de24c7006969f493ba6bfbbc5b572d80 (patch) | |
| tree | 8c9cd3b7068aaccba443577ec92b78eb46bb7e8e /setup.c | |
| parent | Tidy up git mergetool's backup file behaviour (diff) | |
| download | tgif-b3ea27e4de24c7006969f493ba6bfbbc5b572d80.tar.xz | |
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>
Diffstat (limited to 'setup.c')
0 files changed, 0 insertions, 0 deletions