]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 52f2445) | patch
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)
commit82fbd8aedd0030b2ecbb16267ef1ce0179b4d601
tree32be820f572c6a050cd705c0920de624c2f8ed3ftree | snapshot
parent52f2445d5c70a204f614fd83cf98a27359dff04ccommit | diff
git-gui: maintain backwards compatibility for merge syntax

Commit b5f325c updated to use the newer merge syntax but continue to
support older versions of git.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
lib/merge.tcl diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.