Andrew's git - gitweb.git/history - t/t3507-cherry-pick-conflict.sh

Andrew's git / gitweb.git / history

summary | log | commit | diff | tree
first ⋅ prev ⋅ next

? re

checkout --conflict=diff3: add a label for ancestor

[gitweb.git] / t / t3507-cherry-pick-conflict.sh

2010-03-21	tests: document cherry-pick behavior in face of conflicts	blob \| diff \| raw

This page took 0.933631 s and 8 git commands to generate.