Code

Merge branch 'ph/mergetool'
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Jul 2008 23:22:42 +0000 (16:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Jul 2008 23:22:42 +0000 (16:22 -0700)
commit5e707b28d9ea0bebfef5aff977e3ccebd53aa045
tree866254290cfe6006a269386770b26936d718a5ae
parent27158e463a1be339ce34c7ee5fb553acaa7e28de
parent641dba49bf819dc5f4874a75b206bc7f51dc14e6
Merge branch 'ph/mergetool'

* ph/mergetool:
  Remove the use of '--' in merge program invocation