summaryrefslogtreecommitdiff
path: root/mergetools/opendiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-31 12:38:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-31 12:38:23 -0700
commitaf77c0b1cf3f8c8ba5ae30cec208227800447f99 (patch)
tree441aabac17ad0a03f69ce7354383708d4372b6bc /mergetools/opendiff
parentMerge branch 'ds/doc-two-kinds-of-tags' (diff)
parentcommit: tweak empty cherry pick advice for sequencer (diff)
downloadtgif-af77c0b1cf3f8c8ba5ae30cec208227800447f99.tar.xz
Merge branch 'jk/commit-how-to-abort-cherry-pick'
* jk/commit-how-to-abort-cherry-pick: commit: tweak empty cherry pick advice for sequencer
Diffstat (limited to 'mergetools/opendiff')
0 files changed, 0 insertions, 0 deletions