# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1383755185 21600
# Node ID 20ef533ffb01cf419ca2cdb7129b813468a15ac0
# Parent  c05b968d05eb93762c81d628ea804478565a3015
merge: update comment for future devs

diff -r c05b968d05eb -r 20ef533ffb01 mercurial/merge.py
--- a/mercurial/merge.py	Wed Jan 15 18:14:12 2014 -0600
+++ b/mercurial/merge.py	Wed Nov 06 10:26:25 2013 -0600
@@ -680,7 +680,9 @@
     try:
         wc = repo[None]
         if node is None:
-            # tip of current branch
+            # Here is where we should consider bookmarks, divergent bookmarks,
+            # foreground changesets (successors), and tip of current branch;
+            # but currently we are only checking the branch tips.
             try:
                 node = repo.branchtip(wc.branch())
             except error.RepoLookupError: