Mercurial > hg > mercurial-crew-with-dirclash
annotate contrib/git-viz/git-diff-tree @ 1798:d610fe0e6893
hgmerge: do not use file with markers in tools merging themselves
This time I forgot about a crucial part of the logic change.
The patch makes kdiff3 and tkdiff useful again.
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Thu, 23 Feb 2006 18:10:04 +0100 |
parents | d8abb687d501 |
children |
rev | line source |
---|---|
406
d8abb687d501
[PATCH] Using monotone-viz/git-viz with mercurial
mpm@selenic.com
parents:
diff
changeset
|
1 #!/bin/sh |
d8abb687d501
[PATCH] Using monotone-viz/git-viz with mercurial
mpm@selenic.com
parents:
diff
changeset
|
2 |
d8abb687d501
[PATCH] Using monotone-viz/git-viz with mercurial
mpm@selenic.com
parents:
diff
changeset
|
3 op=`basename $0 | sed -e 's/^git-//'` |
d8abb687d501
[PATCH] Using monotone-viz/git-viz with mercurial
mpm@selenic.com
parents:
diff
changeset
|
4 exec hgit $op "$@" |
d8abb687d501
[PATCH] Using monotone-viz/git-viz with mercurial
mpm@selenic.com
parents:
diff
changeset
|
5 |