![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| 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) | ||
| commit | 5e707b28d9ea0bebfef5aff977e3ccebd53aa045 | |
| tree | 866254290cfe6006a269386770b26936d718a5ae | tree | snapshot |
| parent | 27158e463a1be339ce34c7ee5fb553acaa7e28de | commit | diff |
| parent | 641dba49bf819dc5f4874a75b206bc7f51dc14e6 | commit | diff |
Merge branch 'ph/mergetool'
* ph/mergetool:
Remove the use of '--' in merge program invocation
* ph/mergetool:
Remove the use of '--' in merge program invocation