diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:44:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:44:43 -0800 |
| commit | 22c4e72d6eef8295a3311f6eb2f82a5494f8b88e (patch) | |
| tree | 8bffa625a10a3e3e0e60db86ea5017565a1d99fd /contrib/vim | |
| parent | Merge branch 'jc/pretty-lf' (diff) | |
| parent | builtin-merge.c: call exclude_cmds() correctly. (diff) | |
| download | tgif-22c4e72d6eef8295a3311f6eb2f82a5494f8b88e.tar.xz | |
Merge branch 'ap/maint-merge-strategy-list-fix'
Diffstat (limited to 'contrib/vim')
0 files changed, 0 insertions, 0 deletions