Andrew's git / gitweb.git / commit
?
git-gui: Allow git-merge to use branch names in conflict markers
authorShawn O. Pearce <spearce@spearce.org>
Mon, 20 Aug 2007 06:17:05 +0000 (02:17 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 20 Aug 2007 06:17:05 +0000 (02:17 -0400)
commit18a01a0...a428c9e1034247e2b40c62e506b73580
treede74e0f...54a25ae88ce8cdb8c05cdc7585143d29copy hash to clipboard (tree)
parentc6951dd...522a7d8ee0fc371cf9c37e727e676989copy hash to clipboard (diff)
lib/merge.tcl diff | blob | history