summaryrefslogtreecommitdiff
path: root/t/t4015-diff-whitespace.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-09-23 15:31:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-09-23 15:31:08 -0700
commitb7619006ebd9c9760b34bb38e04ce4dc8c606483 (patch)
tree3c1640e3f5ec3d1373e290a806554f194f6bd46a /t/t4015-diff-whitespace.sh
parentmerge-recursive: Do not look at working tree during a virtual ancestor merge (diff)
parentGit 1.7.6.4 (diff)
downloadtgif-b7619006ebd9c9760b34bb38e04ce4dc8c606483.tar.xz
Merge 1.7.6.4 in
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4015-diff-whitespace.sh')
0 files changed, 0 insertions, 0 deletions