author | Junio C Hamano <gitster@pobox.com> | |
Tue, 1 Jul 2008 23:22:42 +0000 (16:22 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 1 Jul 2008 23:22:42 +0000 (16:22 -0700) |
* ph/mergetool:
Remove the use of '--' in merge program invocation
Remove the use of '--' in merge program invocation
Trivial merge