Merge branch 'br/mergetools-guiffy'

diff --git a/Makefile b/Makefile
index f181687250d1d7cf9e1d8b5013980751a34d527b..2e198c41dcebc7efbae92678f4de63b228f0622b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -783,6 +783,7 @@ LIB_OBJS += branch.o
 LIB_OBJS += bulk-checkin.o
 LIB_OBJS += bundle.o
 LIB_OBJS += cache-tree.o
+LIB_OBJS += chdir-notify.o
 LIB_OBJS += checkout.o
 LIB_OBJS += color.o
 LIB_OBJS += column.o