Add smerge support to the git back end.
commitb5354531bac4ea261d66804ac81be222fdeaaec2
authorEric S. Raymond <esr@thyrsus.com>
Wed, 13 Aug 2014 08:42:33 +0000 (13 04:42 -0400)
committerEric S. Raymond <esr@thyrsus.com>
Wed, 13 Aug 2014 08:42:33 +0000 (13 04:42 -0400)
tree3cfdc1df487cd269f46abaa80596ae794e460cd3
parent2cc441ecbf093d2d7e319f2359b80fd358589b0f
Add smerge support to the git back end.
lisp/ChangeLog
lisp/vc/vc-git.el