I cant get it to work, but the integration in git is not the issue. For posterity,
you can integrate it this way:
echo 'merge_cmd () {
"$merge_tool_path" mergetool \
"$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"
}' > /usr/lib/git-core/mergetools/smerge
git config --global merge.tool smerge
Git invokes smerge correctly (accoring to the doc),
but Sumblime Merge
will change the cwd and complain about a
missing git repository (It should use only the files anyway).
$ git mergetool
Merging:
package/glibc/glibc.mk
Normal merge conflict for 'package/glibc/glibc.mk':
{local}: modified file
{remote}: modified file
+ smerge mergetool ./package/glibc/glibc_BASE_5507.mk ./package/glibc/glibc_LOCAL_5507.mk ./package/glibc/glibc_REMOTE_5507.mk -o package/glibc/glibc.mk
Unable to find a git repository at /usr/bin/smerge
+ check_unchanged
+ test package/glibc/glibc.mk -nt ./package/glibc/glibc_BACKUP_5507.mk
+ true
+ echo package/glibc/glibc.mk seems unchanged.
package/glibc/glibc.mk seems unchanged.