git-merge documentation: describe how conflict is presented
[gitweb.git] / git-gui / windows /
drwxr-xr-x   parent (dest: git-gui; base: 70a3f89733a4cd21631690ba980598fea2249067)
-rw-r--r-- 483 git-gui.sh