diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-07-14 23:47:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-14 23:47:14 -0700 |
| commit | 19792b27da51bc52cfd08c7a17473b8a1f26d8a3 (patch) | |
| tree | 2cd6ca572e00dda2d3813cf745984a7adf464663 /t/t6021-merge-criss-cross.sh | |
| parent | Merge branch 'jc/branch-merged' (diff) | |
| parent | builtin-rerere: more carefully find conflict markers (diff) | |
| download | tgif-19792b27da51bc52cfd08c7a17473b8a1f26d8a3.tar.xz | |
Merge branch 'om/rerere-careful'
* om/rerere-careful:
builtin-rerere: more carefully find conflict markers
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
0 files changed, 0 insertions, 0 deletions