author | Junio C Hamano <gitster@pobox.com> | |
Wed, 19 Oct 2011 17:49:13 +0000 (10:49 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 19 Oct 2011 17:49:13 +0000 (10:49 -0700) |
* rs/diff-whole-function:
diff: add option to show whole functions as context
xdiff: factor out get_func_line()
diff: add option to show whole functions as context
xdiff: factor out get_func_line()
1 | 2 | |||
---|---|---|---|---|
Documentation/diff-options.txt | patch | | diff1 | | diff2 | | blob | history |
diff.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/diff-options.txt
Simple merge
diff --cc diff.c
Simple merge