| commit | 641dba49bf819dc5f4874a75b206bc7f51dc14e6 | |
| author | Patrick Higgins <patrick.higgins@cexp.com> | |
| Mon, 16 Jun 2008 23:33:41 +0000 (16 17:33 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 19 Jun 2008 21:13:55 +0000 (19 14:13 -0700) | ||
| tree | 798b8d6fc0aac56346d545f006d90bb63613287a | treesnapshot (tar.gz zip) |
| parent | e449f105805ffa49ccf7cf080db897ecf65a1a0f | commitdiff |
Remove the use of '--' in merge program invocation
Put a "./" at the beginning of all paths given to the merge program so
that filenames beginning with a '-' character don't get interpreted as
options.
This deals with a problem where kdiff3 can be compiled with or without
support for the '--' separator between options and filenames.
Signed-off-by: Patrick Higgins <patrick.higgins@cexp.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Put a "./" at the beginning of all paths given to the merge program so
that filenames beginning with a '-' character don't get interpreted as
options.
This deals with a problem where kdiff3 can be compiled with or without
support for the '--' separator between options and filenames.
Signed-off-by: Patrick Higgins <patrick.higgins@cexp.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-mergetool.sh | diffblobblamehistory |