Documentation/git-merge.txt: Partial rewrite of How Merge Works
[gitweb.git] / compat / winansi.c
2008-07-19 Add ANSI control code emulation for the Windows console