diff options
| author | Pat Thoyts <patthoyts@users.sourceforge.net> | 2016-10-04 12:49:05 +0100 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2016-10-04 23:14:05 +0100 |
| commit | 82fbd8aedd0030b2ecbb16267ef1ce0179b4d601 (patch) | |
| tree | 32be820f572c6a050cd705c0920de624c2f8ed3f /git-gui/lib | |
| parent | 52f2445d5c70a204f614fd83cf98a27359dff04c (diff) | |
| download | git-82fbd8aedd0030b2ecbb16267ef1ce0179b4d601.tar.gz git-82fbd8aedd0030b2ecbb16267ef1ce0179b4d601.tar.xz | |
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>
Diffstat (limited to 'git-gui/lib')
0 files changed, 0 insertions, 0 deletions