Use nice names in conflict markers during cherry-pick/revert.
authorShawn O. Pearce <spearce@spearce.org>
Mon, 15 Jan 2007 06:41:22 +0000 (01:41 -0500)
committerJunio C Hamano <junkio@cox.net>
Mon, 15 Jan 2007 07:17:32 +0000 (23:17 -0800)
commit6e2931a...ed887bd75ed68085a7e04bc88574d69e
treea88c0de...e369cbf70b17fbe123305441d70f4c8fcopy hash to clipboard (tree)
parentacb4441...0dabaaa666ecae11fdafc27c3691e763copy hash to clipboard (diff)
git-revert.sh