Add an option to the TortoiseGitMerge settings dialog to specify the number of contex...
treeb46502eef9841d173a44d20381294113a4402989
-rw-r--r-- 429 .gitignore
-rw-r--r-- 679 .gitmodules
-rw-r--r-- 224 .mailmap
-rw-r--r-- 255 .tgitconfig
drwxr-xr-x - Languages
-rw-r--r-- 2878 build.txt
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - ext
-rw-r--r-- 958 release.txt
drwxr-xr-x - src
drwxr-xr-x - test