summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2008-01-20 23:03:23 -0500
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2008-01-20 23:03:23 -0500
commit6caaf2daf0ea50ff99009b94f24252b8fa747e64 (patch)
tree11f0864801218827c99a1b2786dc3fb7e3bfec78 /merge-recursive.c
parentgit-gui: Consolidate hook execution code into a single function (diff)
downloadtgif-6caaf2daf0ea50ff99009b94f24252b8fa747e64.tar.xz
git-gui: Correct encoding of glossary/fr.po to UTF-8
Junio noticed this was incorrectly added in ISO-8859-1 but it should be in UTF-8 (as the headers claim UTF-8, and our convention is to use only UTF-8). Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions