summaryrefslogtreecommitdiff
path: root/git-gui/lib/merge.tcl
diff options
context:
space:
mode:
authorLibravatar Johannes Sixt <j6t@kdbg.org>2013-10-26 21:17:16 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-10-28 09:00:38 -0700
commitf94ea11cf2b070ef221f0f4c2355a9ee2f340177 (patch)
treecc219ab153738f62edb9f91c6d3d1bb4a2039cff /git-gui/lib/merge.tcl
parentWindows: a test_cmp that is agnostic to random LF <> CRLF conversions (diff)
downloadtgif-f94ea11cf2b070ef221f0f4c2355a9ee2f340177.tar.xz
tests: undo special treatment of CRLF for Windows
Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions