summaryrefslogtreecommitdiff
path: root/mergetools/defaults
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2012-06-12 15:45:16 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-12 07:25:11 -0700
commit43bc2302706af6a3bb9266eea1bcb7071c54c8c6 (patch)
tree2b61e30ffe058d774da8066406441c3badcd24f3 /mergetools/defaults
parentbuiltin-fast-export: Add importing and exporting of revision marks (diff)
downloadtgif-43bc2302706af6a3bb9266eea1bcb7071c54c8c6.tar.xz
fast-export: report SHA-1 instead of gibberish when marks exist already
Cc: Pieter de Bie <pdebie@ai.rug.nl> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Max Horn <max@quendi.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/defaults')
0 files changed, 0 insertions, 0 deletions