diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-19 10:48:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-19 10:48:38 -0700 |
| commit | 2201cc8c977918c520e70093f4b74bbdf70afcc5 (patch) | |
| tree | fb02d2b778207f6d4e91940e1e568031b8cb9698 /lockfile.c | |
| parent | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' (diff) | |
| parent | submodule: Search for merges only at end of recursive merge (diff) | |
| download | tgif-2201cc8c977918c520e70093f4b74bbdf70afcc5.tar.xz | |
Merge branch 'bk/submodule-in-recursive-merge'
* bk/submodule-in-recursive-merge:
submodule: Search for merges only at end of recursive merge
submodule: Demonstrate known breakage during recursive merge
Diffstat (limited to 'lockfile.c')
0 files changed, 0 insertions, 0 deletions