log

age author description
Fri, 11 Sep 2020 09:55:08 -0700 Martin von Zweigbergk tests: make emacs test less strict
Thu, 10 Sep 2020 13:12:34 -0700 Martin von Zweigbergk graphlog: use '%' only if there are *unresolved* conflicts
Wed, 26 Aug 2020 17:24:22 +0530 Pulkit Goyal merge: show number of ancestors in bid merge debug notes
Thu, 03 Sep 2020 14:45:16 +0530 Pulkit Goyal debugmergestate: sort extras before printing
Mon, 24 Aug 2020 18:59:19 +0530 Pulkit Goyal debugmergestate: show extras for files which are not in mergestate
Thu, 10 Sep 2020 16:51:40 +0530 Pulkit Goyal tests: update lockdelay.py to handle the `wait` argument
Thu, 03 Sep 2020 14:14:04 +0530 Pulkit Goyal commit: pass mergestate into _filecommit() instead of re-reading it
Fri, 11 Sep 2020 13:04:05 +0530 Sushil khanchi py3: fix bytes and str mixup in run-tests