summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorLibravatar Abhijit Menon-Sen <ams@toroid.org>2008-07-07 02:50:10 +0530
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-07-06 22:58:56 -0700
commit4a588075c54cd5902e5f4d43b9d6b0c31d0f9769 (patch)
tree3b8fbfa52e8eccb74a2bb33437443be70d0542ea /xdiff
parentImplement "git stash branch <newbranch> <stash>" (diff)
downloadtgif-4a588075c54cd5902e5f4d43b9d6b0c31d0f9769.tar.xz
Add a test for "git stash branch"
Make sure that applying the stash to a new branch after a conflicting change doesn't result in an error when you try to commit. Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions