diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-10 13:59:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-10 13:59:01 -0800 |
| commit | 38ca63f3c0ef70ba4e41d3b5e347e2c7e7d67fe5 (patch) | |
| tree | 0c17b09af9b08d92787da10a8c68e2f0e80f75c9 /git-submodule.sh | |
| parent | 2d1abfa8eeeb168bdd5d05302c1a57f30973711e (diff) | |
| parent | ec245ba04944473ba6657a826643ef90ed02b51d (diff) | |
| download | git-38ca63f3c0ef70ba4e41d3b5e347e2c7e7d67fe5.tar.gz git-38ca63f3c0ef70ba4e41d3b5e347e2c7e7d67fe5.tar.xz | |
Merge branch 'da/maint-mergetool-twoway' into maint
* da/maint-mergetool-twoway:
mergetool: Provide an empty file when needed
Diffstat (limited to 'git-submodule.sh')
0 files changed, 0 insertions, 0 deletions