diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:48:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:48:44 -0700 |
| commit | bd21822572d2852917abd71d030c8b2e789eb4de (patch) | |
| tree | 89e267bd418726f4a316b8899cb20e4ec0a59816 /t/t3411-rebase-preserve-around-merges.sh | |
| parent | Merge branch 'rr/rebase-sha1-by-string-query' (diff) | |
| parent | unpack-trees: don't shift conflicts left and right (diff) | |
| download | tgif-bd21822572d2852917abd71d030c8b2e789eb4de.tar.xz | |
Merge branch 'rs/unpack-trees-tree-walk-conflict-field'
Code clean-up.
* rs/unpack-trees-tree-walk-conflict-field:
unpack-trees: don't shift conflicts left and right
Diffstat (limited to 't/t3411-rebase-preserve-around-merges.sh')
0 files changed, 0 insertions, 0 deletions