diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-29 15:39:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-29 15:39:39 -0700 |
| commit | d3759c08055d97434714f0b5afb592ddb0a544db (patch) | |
| tree | 413274013d639a325316f714373abe7280fc5d0b /commit.c | |
| parent | quiltimport: Skip non-existent patches (diff) | |
| parent | mergetool: Fix typo in options passed to kdiff3 (diff) | |
| download | git-d3759c08055d97434714f0b5afb592ddb0a544db.tar.gz git-d3759c08055d97434714f0b5afb592ddb0a544db.zip | |
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)
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions