# HG changeset patch # User Meredith Howard # Date 1446088234 14400 # Node ID 9ab4c7db4b3a8156691d80608ba4538e7ec798ae # Parent 388973873b1b419eba06cea168c2d9af19d5ec23 Add diffs to commit template diff --git a/.hgrc b/.hgrc --- a/.hgrc +++ b/.hgrc @@ -27,5 +27,14 @@ vimdiff.executable = vim vimdiff.args = -d $base $local $output $other +close +close vimdiff.check = changed, conflicts +[committemplate] +changeset = {desc}\n\n + HG: {extramsg} + HG: user: {author}\n{ifeq(p2rev, "-1", "", + "HG: branch merge\n") + }HG: branch '{branch}'\n{if(currentbookmark, + "HG: bookmark '{currentbookmark}'\n") }{subrepos % + "HG: subrepo {subrepo}\n" } + {splitlines(diff()) % 'HG: {line}\n'} %include ~/.hgrc.local