summaryrefslogtreecommitdiff
path: root/archive-zip.c
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@inf.ethz.ch>2013-04-12 18:05:10 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-12 11:34:37 -0700
commitd51c5274e458e9c2545144b6821978ccda85c117 (patch)
tree1b14ee62ac69791c4ba1c54266d4621516e14923 /archive-zip.c
parentt4211: pass -M to 'git log -M -L...' test (diff)
downloadtgif-d51c5274e458e9c2545144b6821978ccda85c117.tar.xz
log -L: test merge of parallel modify/rename
This tests a toy example of a history like * Merge | \ | * Modify foo | | * | Rename foo->bar | / * Create foo Current log -L fails on this; we'll fix it in the next commit. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'archive-zip.c')
0 files changed, 0 insertions, 0 deletions