See https://github.com/martinvonz/jj for a VCS that's compatible with Git and has a simpler CLI with undo functionality and first-class conflicts (you can rebase conflict resolutions, for example). It's what we're planning to replace Mercurial with at Google.
There was another project called jj (JSON Stream Editor) mentioned here recently: