diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-12 21:50:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-12 21:50:58 -0800 |
| commit | 72b6157aa847615a778ac9950e87dde109afa50c (patch) | |
| tree | 691238c7db13ab8a743807731a44e3c493973c25 /git-merge-resolve.sh | |
| parent | 459d60084fa463203d0adfc99cbf5d6fcd7edd43 (diff) | |
| parent | a79b8b6623288f7d5409ad749cc6553976a4f0e8 (diff) | |
| download | git-72b6157aa847615a778ac9950e87dde109afa50c.tar.gz | |
Merge branch 'jk/diff-convfilter'
* jk/diff-convfilter:
enable textconv for diff in verbose status/commit
wt-status: load diff ui config
only textconv regular files
userdiff: require explicitly allowing textconv
refactor userdiff textconv code
Conflicts:
t/t4030-diff-textconv.sh
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions