commit | d3759c08055d97434714f0b5afb592ddb0a544db | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Sat Sep 29 15:39:39 2007 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Sat Sep 29 15:39:39 2007 -0700 |
tree | 413274013d639a325316f714373abe7280fc5d0b | |
parent | 9f569fe58f2e9a6547ae75971ebf3910be3d5872 [diff] | |
parent | 208fe3ac7e1fd5be173cae1db4fa776390bc4e7d [diff] |
Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maint * 'mergetool' of git://repo.or.cz/git/mergetool: mergetool: Fix typo in options passed to kdiff3 mergetool: fix emerge when running in a subdirectory Mergetool generating blank files (1.5.3)