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 /advice.c | |
| parent | ab085174294ff473fbc1aca59f3b4c052e9acd77 (diff) | |
| parent | ec245ba04944473ba6657a826643ef90ed02b51d (diff) | |
| download | git-5e92376f8f70603e570f821267fc86c78175eb09.tar.gz | |
Merge branch 'da/maint-mergetool-twoway'
* da/maint-mergetool-twoway:
mergetool: Provide an empty file when needed
Diffstat (limited to 'advice.c')
0 files changed, 0 insertions, 0 deletions