diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-15 11:00:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-15 11:00:24 -0800 |
| commit | d6b634fafdb5570d9c25d5176d3d32fe0b22530d (patch) | |
| tree | 381c0541692cd85a07a6582f8e1e3c238f7bf230 /t/t6024-recursive-merge.sh | |
| parent | tests: use test_cmp instead of piping to diff(1) (diff) | |
| parent | rebase -X: do not clobber strategy (diff) | |
| download | tgif-d6b634fafdb5570d9c25d5176d3d32fe0b22530d.tar.xz | |
Merge branch 'maint'
* maint:
rebase -X: do not clobber strategy
Diffstat (limited to 't/t6024-recursive-merge.sh')
0 files changed, 0 insertions, 0 deletions