view contrib/git-viz/git-rev-tree @ 993:6f274afc05c7

Clean up some merge logic

- rename mode to branch_merge
- use explicit update mode
- use negative mtime for updates that set mtime
- expand some cryptic variable names
- elaborate merge dirstate comments
- remove redundant manifest lookup for non-merge case
- remove impossible merge case
- fix up test cases

#!/bin/sh

op=`basename $0 | sed -e 's/^git-//'`
exec hgit $op "$@"