diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-01-31 22:01:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-31 22:01:17 -0800 |
| commit | 5e92376f8f70603e570f821267fc86c78175eb09 (patch) | |
| tree | 053d3d8e89d274c552ee3d2b807de71190f2a80e /builtin | |
| parent | Merge branch 'va/git-p4-branch' (diff) | |
| parent | mergetool: Provide an empty file when needed (diff) | |
| download | tgif-5e92376f8f70603e570f821267fc86c78175eb09.tar.xz | |
Merge branch 'da/maint-mergetool-twoway'
* da/maint-mergetool-twoway:
mergetool: Provide an empty file when needed
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions