diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-04 22:25:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-04 22:25:37 -0800 |
| commit | 801bad3ba4eb5014d402201c85c61a969436adf0 (patch) | |
| tree | 647c5370bb49b784401910fc500727a8bf3e49a0 /builtin-merge-recursive.c | |
| parent | Merge branch 'cc/maint-bisect-paths' into maint (diff) | |
| parent | require_work_tree broken with NONGIT_OK (diff) | |
| download | tgif-801bad3ba4eb5014d402201c85c61a969436adf0.tar.xz | |
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
* gf/maint-sh-setup-nongit-ok:
require_work_tree broken with NONGIT_OK
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions