diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:00:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:00:42 -0800 |
| commit | f5b868f81d2176120040b4c7ca223753f2dd5c1d (patch) | |
| tree | 79d11abc17c4a346731dc4518015afa8ae9aafb8 /builtin/merge-ours.c | |
| parent | Merge branch 'sg/completion' (diff) | |
| parent | completion: Support the DWIM mode for git checkout (diff) | |
| download | tgif-f5b868f81d2176120040b4c7ca223753f2dd5c1d.tar.xz | |
Merge branch 'kb/completion-checkout'
* kb/completion-checkout:
completion: Support the DWIM mode for git checkout
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions