summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2016-10-21 14:25:08 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-21 09:32:34 -0700
commit1dfc84e9e040aa694548731eae434934379b928f (patch)
treecd9bc5b49cac0017865b2d207e331e3b90544b8a /merge-recursive.h
parentsequencer: prepare for rebase -i's commit functionality (diff)
downloadtgif-1dfc84e9e040aa694548731eae434934379b928f.tar.xz
sequencer: introduce a helper to read files written by scripts
As we are slowly teaching the sequencer to perform the hard work for the interactive rebase, we need to read files that were written by shell scripts. These files typically contain a single line and are invariably ended by a line feed (and possibly a carriage return before that). Let's use a helper to read such files and to remove the line ending. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions