diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-28 11:12:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-28 11:12:31 -0800 |
| commit | a94214b75e2e763d27a85f91066ad90f291206fc (patch) | |
| tree | 346f0e62c52b936f231d62de562abbf61b93125b /builtin/merge-ours.c | |
| parent | Merge branch 'mk/complete-tcsh' into maint (diff) | |
| parent | git-commit-tree(1): correct description of defaults (diff) | |
| download | tgif-a94214b75e2e763d27a85f91066ad90f291206fc.tar.xz | |
Merge branch 'pe/doc-email-env-is-trumped-by-config' into maint
* pe/doc-email-env-is-trumped-by-config:
git-commit-tree(1): correct description of defaults
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions