diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:54:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:54:11 -0800 |
| commit | 99292c638a5c011ce453c904357185d9f6c7dd62 (patch) | |
| tree | 104fca741d5078b3b41f1ecc38951aa34ef4dcf5 /t | |
| parent | 78b77c491ff21e27dbaf1381268aeb380f0607b8 (diff) | |
| parent | ed87465658c83a5a1617920e7b605bd830a78aed (diff) | |
| download | git-99292c638a5c011ce453c904357185d9f6c7dd62.tar.gz | |
Merge branch 'ap/maint-merge-strategy-list-fix' into maint
* ap/maint-merge-strategy-list-fix:
builtin-merge.c: call exclude_cmds() correctly.
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions