summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-08-05 21:20:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-08-05 21:20:59 -0700
commit2d0f5f3459278475602394a7165bf8919412f4e4 (patch)
treef14a51ff1124686f269ffa9065ba2e070298f5ce /git-merge-resolve.sh
parentdiff.renamelimit is a basic diff configuration (diff)
downloadtgif-2d0f5f3459278475602394a7165bf8919412f4e4.tar.xz
RelNotes 1.5.6.5 updates
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions