| commit | 918de5166eca6f7c19566d8d83e14647c1afaeac | |
| author | Sup Yut Sum <ch3cooli@gmail.com> | |
| Sun, 20 Jul 2014 15:42:06 +0000 (20 23:42 +0800) | ||
| committer | Sup Yut Sum <ch3cooli@gmail.com> | |
| Sun, 20 Jul 2014 15:42:06 +0000 (20 23:42 +0800) | ||
| tree | b46502eef9841d173a44d20381294113a4402989 | treesnapshot (tar.gz zip) |
| parent | bc139734dae8791a418fbf4ebda23c83ebc5e0c4 | commitdiff |
Add an option to the TortoiseGitMerge settings dialog to specify the number of context lines in a patch file
For TortoiseGitMerge, set context lines settings to -1 to use the value from diff.context
Based on TortoiseSVN revision 25542
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
For TortoiseGitMerge, set context lines settings to -1 to use the value from diff.context
Based on TortoiseSVN revision 25542
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>