diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-28 11:12:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-28 11:12:36 -0800 |
| commit | 095d65d73b92040d7b277792172826d28225fa66 (patch) | |
| tree | ff67ca6efce8cc2179b5a71be1ba12d95c4a4f77 /builtin/merge-ours.c | |
| parent | Merge branch 'pe/doc-email-env-is-trumped-by-config' into maint (diff) | |
| parent | contrib/vim: simplify instructions for old vim support (diff) | |
| download | tgif-095d65d73b92040d7b277792172826d28225fa66.tar.xz | |
Merge branch 'jn/maint-trim-vim-contrib' into maint
* jn/maint-trim-vim-contrib:
contrib/vim: simplify instructions for old vim support
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions