Code

checkout --conflict=<style>: recreate merge in a non-default style
[git.git] / gitk-git /
drwxr-xr-x   ..
-rw-r--r-- 1771 Makefile
-rw-r--r-- 274458 gitk
drwxr-xr-x - po