diff options
| author |  Patrick Higgins <patrick.higgins@cexp.com> | 2008-06-16 17:33:41 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-06-19 14:13:55 -0700 |
| commit | 641dba49bf819dc5f4874a75b206bc7f51dc14e6 (patch) | |
| tree | 798b8d6fc0aac56346d545f006d90bb63613287a /commit.c | |
| parent | GIT 1.5.6 (diff) | |
| download | tgif-641dba49bf819dc5f4874a75b206bc7f51dc14e6.tar.xz | |
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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions