diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:02:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:02:08 -0800 |
| commit | 6f49ed6153be9f37d48bdec4a036a8b8a5629590 (patch) | |
| tree | 285010e41604c0d8990c94f7dd1440cdfd96df87 /contrib/examples/git-merge.sh | |
| parent | Merge branch 'kb/maint-diff-ws-check' (diff) | |
| parent | config: treat non-existent config files as empty (diff) | |
| download | tgif-6f49ed6153be9f37d48bdec4a036a8b8a5629590.tar.xz | |
Merge branch 'jk/missing-config'
* jk/missing-config:
config: treat non-existent config files as empty
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions