diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-08-05 06:11:12 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-06 09:20:00 -0700 |
| commit | d347cee4deda2e740f3c9e0046a86b46debdaeb8 (patch) | |
| tree | 43fe13da6fadea23ef5ba7aa572b7a31611f10e6 /xdiff | |
| parent | t6038 (merge.renormalize): style nitpicks (diff) | |
| download | tgif-d347cee4deda2e740f3c9e0046a86b46debdaeb8.tar.xz | |
t6038 (merge.renormalize): try checkout -m and cherry-pick
checkout -m and cherry-pick have not been wired up to respect
merge.renormalize, but a naïve user would not know that.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions