| commit | 82fbd8aedd0030b2ecbb16267ef1ce0179b4d601 | |
| author | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Tue, 4 Oct 2016 11:49:05 +0000 (4 12:49 +0100) | ||
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Tue, 4 Oct 2016 22:14:05 +0000 (4 23:14 +0100) | ||
| tree | 32be820f572c6a050cd705c0920de624c2f8ed3f | treesnapshot (tar.gz zip) |
| parent | 52f2445d5c70a204f614fd83cf98a27359dff04c | commitdiff |
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>
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 | diffblobblamehistory |