diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-19 17:48:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-19 17:48:38 (GMT) |
| commit | 2201cc8c977918c520e70093f4b74bbdf70afcc5 (patch) | |
| tree | fb02d2b778207f6d4e91940e1e568031b8cb9698 /builtin/revert.c | |
| parent | c31b87d111f6df359255979ea94e8648a51c3647 (diff) | |
| parent | 80988783c8c417c5e914256b43ed3604cc8fa4c3 (diff) | |
| download | git-2201cc8c977918c520e70093f4b74bbdf70afcc5.zip git-2201cc8c977918c520e70093f4b74bbdf70afcc5.tar.gz git-2201cc8c977918c520e70093f4b74bbdf70afcc5.tar.bz2 | |
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 'builtin/revert.c')
0 files changed, 0 insertions, 0 deletions