summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-30 23:49:32 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-31 00:35:57 (GMT)
commit53af9816bcb1d441fef76c3adaf0c4cb858768ac (patch)
tree3f342ba33e9c455dedce0e5d1e1dac3307dbb11e /xdiff/xmerge.c
parent677cfed56ac530878b746ee4cca3ada8af384a81 (diff)
downloadgit-53af9816bcb1d441fef76c3adaf0c4cb858768ac.zip
git-53af9816bcb1d441fef76c3adaf0c4cb858768ac.tar.gz
git-53af9816bcb1d441fef76c3adaf0c4cb858768ac.tar.bz2
i18n: drop "encoding" header in the output after re-coding.
After re-coding the commit message into the encoding the user specified (either with core.logoutputencidng or --encoding option), this drops the "encoding" header altogether. The output is after re-coding as the user asked (either with the config or --encoding=<encoding> option), and the extra header becomes redundant information. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions