diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-28 11:12:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-28 11:12:47 -0800 |
| commit | 7025616048e2cdf61b7f5c6e4fba8045020fb537 (patch) | |
| tree | f56fa3fdf48e1e646552b731b05a4063b5f1446c /builtin/merge-ours.c | |
| parent | Merge branch 'jn/maint-trim-vim-contrib' into maint (diff) | |
| parent | git-completion.bash: silence "not a valid object" errors (diff) | |
| download | tgif-7025616048e2cdf61b7f5c6e4fba8045020fb537.tar.xz | |
Merge branch 'ds/completion-silence-in-tree-path-probe' into maint
* ds/completion-silence-in-tree-path-probe:
git-completion.bash: silence "not a valid object" errors
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions