summaryrefslogtreecommitdiff
path: root/Documentation/git-grep.txt
diff options
context:
space:
mode:
authorLibravatar Charles Bailey <charles@hashpling.org>2009-05-25 01:21:14 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-05-24 23:56:34 -0700
commit5719db91ce5915ee07c50f1afdc94fe34e91529f (patch)
tree7b156560fb631ca53bac749400485c8946e16904 /Documentation/git-grep.txt
parentt6023: merge-file fails to output anything for a degenerate merge (diff)
downloadtgif-5719db91ce5915ee07c50f1afdc94fe34e91529f.tar.xz
Change xdl_merge to generate output even for null merges
xdl_merge used to have a check to ensure that there was at least some change in one or other side being merged but this suppressed output for the degenerate case when base, local and remote contents were all identical. Removing this check enables correct output in the degenerate case and xdl_free_script handles freeing NULL scripts so there is no need to have the check for these calls. Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-grep.txt')
0 files changed, 0 insertions, 0 deletions