summaryrefslogtreecommitdiffstats
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2009-03-10 22:58:09 +0100
committerJunio C Hamano <gitster@pobox.com>2009-03-11 07:23:02 +0100
commit1897713fbd96229f3581b8e8a5653da917882195 (patch)
treef152aa5152a5ffba679fc7925248172569faf5b4 /builtin-merge.c
parentrecv_sideband: Bands #2 and #3 always go to stderr (diff)
downloadgit-1897713fbd96229f3581b8e8a5653da917882195.tar.xz
git-1897713fbd96229f3581b8e8a5653da917882195.zip
winansi: support ESC [ K (erase in line)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions