diff options
| author |  Jeff King <peff@peff.net> | 2011-07-06 11:13:30 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-07-06 11:10:11 -0700 |
| commit | d28790dc31ca1bcdca7254a6b9381b6c84e91271 (patch) | |
| tree | 290988244cf5eb56978a632433bb6eb61b42352b /git-gui/lib/merge.tcl | |
| parent | Merge git://bogomips.org/git-svn into maint (diff) | |
| download | tgif-d28790dc31ca1bcdca7254a6b9381b6c84e91271.tar.xz | |
docs: document --textconv diff option
This has been there since textconv existed, but was never
documented. There is some overlap with what's in
gitattributes(5), but it's important to warn in both places
that textconv diffs probably can't be applied.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions