diff options
| author | Ollivier Robert <roberto@FreeBSD.org> | 2007-10-02 16:13:09 +0000 |
|---|---|---|
| committer | Ollivier Robert <roberto@FreeBSD.org> | 2007-10-02 16:13:09 +0000 |
| commit | 059add0aad6af260a5fa41e9ae553de52d17f60a (patch) | |
| tree | 04f92b954688584114a0855c632cab30adb8d813 /devel/mercurial | |
| parent | 3014809adffcf9c4f164f788174e5b12c9a406fb (diff) | |
| download | ports-059add0aad6af260a5fa41e9ae553de52d17f60a.tar.gz ports-059add0aad6af260a5fa41e9ae553de52d17f60a.zip | |
Notes
Diffstat (limited to 'devel/mercurial')
| -rw-r--r-- | devel/mercurial/files/patch-hgmerge | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/devel/mercurial/files/patch-hgmerge b/devel/mercurial/files/patch-hgmerge new file mode 100644 index 000000000000..bbc911b23e02 --- /dev/null +++ b/devel/mercurial/files/patch-hgmerge @@ -0,0 +1,11 @@ +--- hgmerge.orig Tue Jun 26 04:18:18 2007 ++++ hgmerge Tue Oct 2 18:07:44 2007 +@@ -37,7 +37,7 @@ + type "$PATCH" >/dev/null 2>&1 || PATCH= + + # find optional visual utilities +-FILEMERGE="/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge" ++FILEMERGE= + KDIFF3="kdiff3" + TKDIFF="tkdiff" + MELD="meld" |