![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Feb 2012 21:59:01 +0000 (13:59 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Feb 2012 21:59:01 +0000 (13:59 -0800) | ||
| commit | 38ca63f3c0ef70ba4e41d3b5e347e2c7e7d67fe5 | |
| tree | 0c17b09af9b08d92787da10a8c68e2f0e80f75c9 | tree | snapshot |
| parent | 2d1abfa8eeeb168bdd5d05302c1a57f30973711e | commit | diff |
| parent | ec245ba04944473ba6657a826643ef90ed02b51d | commit | diff |
Merge branch 'da/maint-mergetool-twoway' into maint
* da/maint-mergetool-twoway:
mergetool: Provide an empty file when needed
* da/maint-mergetool-twoway:
mergetool: Provide an empty file when needed