git-gui: maintain backwards compatibility for merge syntax
authorPat Thoyts <patthoyts@users.sourceforge.net>
Tue, 4 Oct 2016 11:49:05 +0000 (12:49 +0100)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Tue, 4 Oct 2016 22:14:05 +0000 (23:14 +0100)
commit82fbd8a...dd0030b2ecbb16267ef1ce0179b4d601
tree32be820...572c6a050cd705c0920de624c2f8ed3fcopy hash to clipboard (tree)
parent52f2445...5c70a204f614fd83cf98a27359dff04ccopy hash to clipboard (diff)
lib/merge.tcl